public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #64548 from NixOS/etcd-3.3.13

Browse Source 
etcd: 3.3.1 -> 3.3.13
This commit is contained in:
edef 2019-07-10 17:11:44 +00:00 committed by GitHub
commit 4a633b5618
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/tests/all-tests.nix
View File

@ -77,6 +77,7 @@ in
elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
env = handleTest ./env.nix {}; env = handleTest ./env.nix {};
etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
ferm = handleTest ./ferm.nix {}; ferm = handleTest ./ferm.nix {};
firefox = handleTest ./firefox.nix {}; firefox = handleTest ./firefox.nix {};
firewall = handleTest ./firewall.nix {}; firewall = handleTest ./firewall.nix {};

2
nixos/tests/etcd-cluster.nix
View File

@ -140,7 +140,7 @@ in {
}; };
subtest "should add another member", sub { subtest "should add another member", sub {
$node1->succeed("etcdctl member add node3 https://node3:2380"); $node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380");
$node3->start(); $node3->start();
$node3->waitForUnit("etcd.service"); $node3->waitForUnit("etcd.service");
$node3->waitUntilSucceeds("etcdctl member list | grep 'node3'"); $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");

7
pkgs/servers/etcd/default.nix
View File

@ -4,7 +4,7 @@ with lib;
buildGoPackage rec { buildGoPackage rec {
name = "etcd-${version}"; name = "etcd-${version}";
version = "3.3.1"; # After updating check that nixos tests pass version = "3.3.13"; # After updating check that nixos tests pass
rev = "v${version}"; rev = "v${version}";
goPackagePath = "github.com/coreos/etcd"; goPackagePath = "github.com/coreos/etcd";
@ -13,15 +13,12 @@ buildGoPackage rec {
inherit rev; inherit rev;
owner = "coreos"; owner = "coreos";
repo = "etcd"; repo = "etcd";
sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl"; sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy";
}; };
subPackages = [ subPackages = [
"cmd/etcd" "cmd/etcd"
"cmd/etcdctl" "cmd/etcdctl"
"cmd/tools/benchmark"
"cmd/tools/etcd-dump-db"
"cmd/tools/etcd-dump-logs"
]; ];
buildInputs = [ libpcap ]; buildInputs = [ libpcap ];