diff options
author | Jaka Hudoklin <offlinehacker@users.noreply.github.com> | 2020-05-20 03:45:25 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-20 03:45:25 +0000 |
commit | c342710d218cf9dd92876f73aef1fcf7b111ece6 (patch) | |
tree | 7df130272c353e23d9d5b55c85e2144213073627 | |
parent | f7394da48a21c8961d5264a892ca9c08237150df (diff) | |
parent | e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a (diff) | |
download | nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar.gz nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar.bz2 nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar.lz nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar.xz nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.tar.zst nixlib-c342710d218cf9dd92876f73aef1fcf7b111ece6.zip |
Merge pull request #88225 from zowoq/etcd
etcd: 3.3.20 -> 3.3.21, etcd_3_4: init at 3.4.8
-rw-r--r-- | pkgs/servers/etcd/3.4.nix | 33 | ||||
-rw-r--r-- | pkgs/servers/etcd/default.nix | 7 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
3 files changed, 37 insertions, 4 deletions
diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix new file mode 100644 index 000000000000..4ceb9451b73f --- /dev/null +++ b/pkgs/servers/etcd/3.4.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "etcd"; + version = "3.4.8"; + + vendorSha256 = null; + + src = fetchFromGitHub { + owner = "etcd-io"; + repo = "etcd"; + rev = "v${version}"; + sha256 = "0kx36kq6a7i3cja3wp9mwbnar752pz8c0n2fcvwyzi6l6ph6alx7"; + }; + + buildPhase = '' + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin + ''; + + meta = with lib; { + description = "Distributed reliable key-value store for the most critical data of a distributed system"; + license = licenses.asl20; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline zowoq ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index bdb4b4883da1..19e2f720e520 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -2,16 +2,15 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.20"; + version = "3.3.21"; - # change to "go.etcd.io/etcd" for >= 3.4 goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w"; + sha256 = "1xrhkynach3c7wsfac6zlpi5n1hy3y75vyimvw2zl7ryhm00413s"; }; buildPhase = '' @@ -34,7 +33,7 @@ buildGoPackage rec { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with maintainers; [ offline ]; + maintainers = with maintainers; [ offline zowoq ]; platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0fe4be256fc..3efae1ad6f2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15543,6 +15543,7 @@ in dspam = callPackage ../servers/mail/dspam { }; etcd = callPackage ../servers/etcd { }; + etcd_3_4 = callPackage ../servers/etcd/3.4.nix { }; ejabberd = callPackage ../servers/xmpp/ejabberd { }; |