diff options
author | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-26 15:42:50 +1000 |
---|---|---|
committer | zowoq <59103226+zowoq@users.noreply.github.com> | 2020-04-27 13:19:01 +1000 |
commit | 0f4ffe94fbfd1982ba18065ea0d02e37f14e6252 (patch) | |
tree | a7e6a96478b0afa810abe675ce273100b81e471e /pkgs/servers/etcd | |
parent | 4bcf123f614be8e75e56bce3c19fbba5c5c9c875 (diff) |
etcd: 3.3.13 -> 3.3.20
Diffstat (limited to 'pkgs/servers/etcd')
-rw-r--r-- | pkgs/servers/etcd/default.nix | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index a5083a20cb779..9a2bf7ce59033 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,33 +1,40 @@ -{ lib, libpcap, buildGoPackage, fetchFromGitHub }: - -with lib; +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "etcd"; - version = "3.3.13"; # After updating check that nixos tests pass - rev = "v${version}"; + version = "3.3.20"; + # change to "go.etcd.io/etcd" for >= 3.4 goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { - inherit rev; - owner = "coreos"; + owner = "etcd-io"; repo = "etcd"; - sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; + rev = "v${version}"; + sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w"; }; - subPackages = [ - "cmd/etcd" - "cmd/etcdctl" - ]; + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + ''; - buildInputs = [ libpcap ]; + passthru.tests = with nixosTests; { + etcd = etcd; + etcd-cluster = etcd-cluster; + }; - meta = { + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; - homepage = "https://coreos.com/etcd/"; - maintainers = with maintainers; [offline]; - platforms = with platforms; linux; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; }; } |