cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #153508 from techknowlogick/update-consul

Browse source 
consul: 1.10.3 -> 1.11.1
This commit is contained in:
Niklas Hambüchen 2022-01-05 00:03:17 +01:00 committed by GitHub
commit b58ebec4d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
maintainers/maintainer-list.nix
View file

@ -11617,6 +11617,12 @@
githubId = 2389333; githubId = 2389333;
name = "Andy Tockman"; name = "Andy Tockman";
}; };
techknowlogick = {
email = "techknowlogick@gitea.io";
github = "techknowlogick";
githubId = 164197;
name = "techknowlogick";
};
Technical27 = { Technical27 = {
email = "38222826+Technical27@users.noreply.github.com"; email = "38222826+Technical27@users.noreply.github.com";
github = "Technical27"; github = "Technical27";

10
pkgs/servers/consul/default.nix
View file

@ -2,7 +2,7 @@
buildGoModule rec { buildGoModule rec {
pname = "consul"; pname = "consul";
version = "1.10.3"; version = "1.11.1";
rev = "v${version}"; rev = "v${version}";
# Note: Currently only release tags are supported, because they have the Consul UI # Note: Currently only release tags are supported, because they have the Consul UI
@ -17,7 +17,7 @@ buildGoModule rec {
owner = "hashicorp"; owner = "hashicorp";
repo = pname; repo = pname;
inherit rev; inherit rev;
sha256 = "sha256-Jn8cF+8Wf4zZ/PFXvjCGpomSa/DvraBGW0LsZQ+Zy+4="; sha256 = "0x374capaz6h8mzvq2pfz4zg3gz27fjbqax65f23zqyl46haj01p";
}; };
passthru.tests.consul = nixosTests.consul; passthru.tests.consul = nixosTests.consul;
@ -26,12 +26,10 @@ buildGoModule rec {
# has a split module structure in one repo # has a split module structure in one repo
subPackages = ["." "connect/certgen"]; subPackages = ["." "connect/certgen"];
vendorSha256 = "sha256-cQP1po9LGunFVocl4+HPs67oae2KpgyfRRB+xGVySUY="; vendorSha256 = "09rz2xv407ym71dap7f6bbqhdnqvylvbd9zg6f6h7qsb88nvyzsp";
doCheck = false; doCheck = false;
deleteVendor = true;
ldflags = [ ldflags = [
"-X github.com/hashicorp/consul/version.GitDescribe=v${version}" "-X github.com/hashicorp/consul/version.GitDescribe=v${version}"
"-X github.com/hashicorp/consul/version.Version=${version}" "-X github.com/hashicorp/consul/version.Version=${version}"
@ -43,6 +41,6 @@ buildGoModule rec {
homepage = "https://www.consul.io/"; homepage = "https://www.consul.io/";
platforms = platforms.linux ++ platforms.darwin; platforms = platforms.linux ++ platforms.darwin;
license = licenses.mpl20; license = licenses.mpl20;
maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 ]; maintainers = with maintainers; [ pradeepchhetri vdemeester nh2 techknowlogick];
}; };
} }