diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-04-27 04:44:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-27 04:44:31 -0500 |
commit | 7320cdf28429e0723df2ea604912c34b39c90d62 (patch) | |
tree | 2b9bfbcf7c686ccaa18f3b7a713fda5806d43692 /pkgs/servers | |
parent | c32c613df691fee0bd986c7cf4d8be84290d93c7 (diff) | |
parent | 0f4ffe94fbfd1982ba18065ea0d02e37f14e6252 (diff) | |
download | nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar.gz nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar.bz2 nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar.lz nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar.xz nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.tar.zst nixpkgs-7320cdf28429e0723df2ea604912c34b39c90d62.zip |
Merge pull request #86038 from zowoq/etcd
etcd: 3.3.13 -> 3.3.20
Diffstat (limited to 'pkgs/servers')
-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 a5083a20cb7..9a2bf7ce590 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; }; } |