diff options
author | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-27 14:17:58 +0300 |
---|---|---|
committer | Arseniy Seroka <jagajaga@users.noreply.github.com> | 2016-03-27 14:17:58 +0300 |
commit | d88ae1045d37f8cd1b3428617670f7358eb45a29 (patch) | |
tree | 28afb3a1ff12c308c71a88710d5088548335a875 | |
parent | 29ed01213ff5772922953d42632466775d92ed4d (diff) | |
parent | 26bd115c9c014279686ebdbfcfc5d7458b95e70f (diff) | |
download | nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar.gz nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar.bz2 nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar.lz nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar.xz nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.tar.zst nixlib-d88ae1045d37f8cd1b3428617670f7358eb45a29.zip |
Merge pull request #14240 from kevincox/etcd-2.3.0
etcd: 2.1.2 -> 2.3.0
-rw-r--r-- | nixos/modules/services/misc/etcd.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/go-packages.nix | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index b3354e330962..bc8064e3c879 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -114,6 +114,7 @@ in { }) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf); serviceConfig = { + Type = "notify"; ExecStart = "${pkgs.etcd}/bin/etcd"; User = "etcd"; PermissionsStartOnly = true; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index bc87da0f2067..5735aac8ad1a 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -789,10 +789,11 @@ let }; etcd = buildFromGitHub { - rev = "v2.1.2"; + rev = "v2.3.0"; owner = "coreos"; repo = "etcd"; - sha256 = "1d3wl9rqbhkkdhfkjfrzjfcwz8hx315zbjbmij3pf62bc1p5nh60"; + sha256 = "1cchlhsdbbqal145cvdiq7rzqqi131iq7z0r2hmzwx414k04wyn7"; + buildInputs = [ pkgs.libpcap tablewriter ]; }; fsnotify.v0 = buildGoPackage rec { |