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

Merge pull request #14240 from kevincox/etcd-2.3.0

Browse Source 
etcd: 2.1.2 -> 2.3.0
This commit is contained in:
Arseniy Seroka 2016-03-27 14:17:58 +03:00
commit d88ae1045d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/services/misc/etcd.nix
View File

@ -114,6 +114,7 @@ in {
}) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf); }) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf);
serviceConfig = { serviceConfig = {
Type = "notify";
ExecStart = "${pkgs.etcd}/bin/etcd"; ExecStart = "${pkgs.etcd}/bin/etcd";
User = "etcd"; User = "etcd";
PermissionsStartOnly = true; PermissionsStartOnly = true;

5
pkgs/top-level/go-packages.nix
View File

@ -789,10 +789,11 @@ let
}; };
etcd = buildFromGitHub { etcd = buildFromGitHub {
rev = "v2.1.2"; rev = "v2.3.0";
owner = "coreos"; owner = "coreos";
repo = "etcd"; repo = "etcd";
sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60"; sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7";
buildInputs = [ pkgs.libpcap tablewriter ];
}; };
fsnotify.v0 = buildGoPackage rec { fsnotify.v0 = buildGoPackage rec {