Unverified Commit 74578d8b authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #274822 from adamcstephens/consul/1.16.4 

consul: license is unfree, 1.17.0 -> 1.17.1
parents f2753175 ded76684

pkgs/servers/consul/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


buildGoModule rec {

  pname = "consul";

  version = "1.17.0";

  version = "1.17.1";

  rev = "v${version}";



  # Note: Currently only release tags are supported, because they have the Consul UI
@@ -17,7 +17,7 @@ buildGoModule rec { 
    owner = "hashicorp";

    repo = pname;

    inherit rev;

    hash = "sha256-fAcgO7r0GrL2GrsX7flezhbQMcg+YBH6Lrn7BW2XMwM=";

    hash = "sha256-z6pO9+fQ+0jeYM3wCG8T/1C5aSeSZITj+f8TmGxR+Gw=";

  };



  passthru.tests.consul = nixosTests.consul;
@@ -26,7 +26,7 @@ buildGoModule rec { 
  # has a split module structure in one repo

  subPackages = ["." "connect/certgen"];



  vendorHash = "sha256-xxREyw7xgx9Zp7nua1yq39TioWvRQXOhWqYaK6eJaOc=";

  vendorHash = "sha256-Xt7azJS65B53jYPWLytNaGQv3Poy+3j4ak1Jq68vZRI=";



  doCheck = false;
@@ -40,7 +40,7 @@ buildGoModule rec { 
    description = "Tool for service discovery, monitoring and configuration";

    homepage = "https://www.consul.io/";

    platforms = platforms.linux ++ platforms.darwin;

    license = licenses.mpl20;

    license = licenses.bsl11;

    maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick];

    mainProgram = "consul";

  };