From 26bd115c9c014279686ebdbfcfc5d7458b95e70f Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sat, 26 Mar 2016 22:01:00 -0400
Subject: [PATCH] etcd: 2.1.2 -> 2.3.0
---
nixos/modules/services/misc/etcd.nix | 1 +
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 {