diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-10 07:13:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-12 14:07:16 +0000 |
| commit | e2698550456abba83c6dcd5d5e5a9990a0b96f8a (patch) | |
| tree | 79a56f0df3fa55e470d84b4dff6059fbf487ec18 /nixpkgs/pkgs/servers/etcd | |
| parent | 1cdc42df888dc98c347e03bd942ed9825a55bcb3 (diff) | |
| parent | 84d74ae9c9cbed73274b8e4e00be14688ffc93fe (diff) | |
| download | nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.gz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.bz2 nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.lz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.xz nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.tar.zst nixlib-e2698550456abba83c6dcd5d5e5a9990a0b96f8a.zip | |
Merge commit '84d74ae9c9cbed73274b8e4e00be14688ffc93fe'
Diffstat (limited to 'nixpkgs/pkgs/servers/etcd')
| -rw-r--r-- | nixpkgs/pkgs/servers/etcd/3.4.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/etcd/default.nix | 9 |
2 files changed, 8 insertions, 11 deletions
diff --git a/nixpkgs/pkgs/servers/etcd/3.4.nix b/nixpkgs/pkgs/servers/etcd/3.4.nix index 699ec033d3f3..be52b1bf1a58 100644 --- a/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.9"; + version = "3.4.13"; - #vendorSha256 = null; revert to `null` for > 3.4.9 - - vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z"; deleteVendor = true; + vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; + + doCheck = false; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "16l4wmnm7mkhpb2vzf6xnhhyx6lj8xx3z6x1bfs05idajnrw824p"; + sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy"; }; buildPhase = '' diff --git a/nixpkgs/pkgs/servers/etcd/default.nix b/nixpkgs/pkgs/servers/etcd/default.nix index 4c0df659f3ed..53ad0d6ed240 100644 --- a/nixpkgs/pkgs/servers/etcd/default.nix +++ b/nixpkgs/pkgs/servers/etcd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.22"; + version = "3.3.25"; goPackagePath = "github.com/coreos/etcd"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; + sha256 = "10cyy6jr2xzmla5yyn850cv323ixrk70fjpk8lxjjjvy0ffmb6hj"; }; buildPhase = '' @@ -24,10 +24,7 @@ buildGoPackage rec { install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - passthru.tests = with nixosTests; { - etcd = etcd; - etcd-cluster = etcd-cluster; - }; + passthru.tests = { inherit (nixosTests) etcd etcd-cluster; }; meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; |