From fe07537efb37f194783ab963b3b74c43d088976f Mon Sep 17 00:00:00 2001
From: Nahum Shalman <nshalman@omniti.com>
Date: Tue, 17 May 2016 13:52:09 +0000
Subject: [PATCH] consul: 0.5.2 -> 0.6.4 (using go 1.6)

consul: 0.5.2 -> 0.6.4 (using go 1.6)
consul-ui: 0.5.2 -> 0.6.4 (using go 1.6)
consul-alerts: 2015-08-09 -> 0.3.3 (using go 1.6)
consul-template: 0.9.0 -> 0.14.0 (using go 1.6)
vault: 0.2.0 -> 0.5.2 (using go 1.6)
---
 pkgs/servers/consul/ui.nix      | 10 +++++-----
 pkgs/top-level/all-packages.nix |  8 ++++----
 pkgs/top-level/go-packages.nix  | 19 +++++++++----------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/servers/consul/ui.nix b/pkgs/servers/consul/ui.nix
index 2aaa7b4a1319..deadd6404eae 100644
--- a/pkgs/servers/consul/ui.nix
+++ b/pkgs/servers/consul/ui.nix
@@ -1,4 +1,4 @@
-{ stdenv, goPackages, ruby, bundlerEnv }:
+{ stdenv, go16Packages, ruby, bundlerEnv, zip }:
 
 let
   # `sass` et al
@@ -11,11 +11,11 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "consul-ui-${goPackages.consul.rev}";
+  name = "consul-ui-${go16Packages.consul.rev}";
 
-  src = goPackages.consul.src;
+  src = go16Packages.consul.src;
 
-  buildInputs = [ ruby gems ];
+  buildInputs = [ ruby gems zip ];
 
   buildPhase = ''
     # Build ui static files
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   installPhase = ''
     # Install ui static files
     mkdir -p $out
-    mv dist/* $out
+    mv ../pkg/web_ui/* $out
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0b4fa87bd763..48716a0c3a0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -696,13 +696,13 @@ in
 
   clib = callPackage ../tools/package-management/clib { };
 
-  consul = goPackages.consul.bin // { outputs = [ "bin" ]; };
+  consul = go16Packages.consul.bin // { outputs = [ "bin" ]; };
 
   consul-ui = callPackage ../servers/consul/ui.nix { };
 
-  consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; };
+  consul-alerts = go16Packages.consul-alerts.bin // { outputs = [ "bin" ]; };
 
-  consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; };
+  consul-template = go16Packages.consul-template.bin // { outputs = [ "bin" ]; };
 
   corosync = callPackage ../servers/corosync { };
 
@@ -16706,7 +16706,7 @@ in
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = goPackages.vault.bin // { outputs = [ "bin" ]; };
+  vault = go16Packages.vault.bin // { outputs = [ "bin" ]; };
 
   vbam = callPackage ../misc/emulators/vbam {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index abf6f62fc8e0..fcf738929100 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -549,10 +549,10 @@ let
   };
 
   consul = buildFromGitHub {
-    rev = "v0.5.2";
+    rev = "v0.6.4";
     owner = "hashicorp";
     repo = "consul";
-    sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7";
+    sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a";
 
     buildInputs = [
       circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint
@@ -571,11 +571,10 @@ let
   };
 
   consul-alerts = buildFromGitHub {
-    rev = "6eb4bc556d5f926dbf15d86170664d35d504ae54";
-    version = "2015-08-09";
+    rev = "v0.3.3";
     owner = "AcalephStorage";
     repo = "consul-alerts";
-    sha256 = "191bmxix3nl4pr26hcdfxa9qpv5dzggjvi86h2slajgyd2rzn23b";
+    sha256 = "1w0mb20w1yazyh84sa30bsw271c5nm7lsx2qg0g3gf6mxdb63lpq";
 
     renameImports = ''
       # Remove all references to included dependency store
@@ -601,7 +600,7 @@ let
   };
 
   consul-template = buildGoPackage rec {
-    rev = "v0.9.0";
+    rev = "v0.14.0";
     name = "consul-template-${rev}";
     goPackagePath = "github.com/hashicorp/consul-template";
 
@@ -609,7 +608,7 @@ let
       inherit rev;
       owner = "hashicorp";
       repo = "consul-template";
-      sha256 = "1k64rjskzn7cxn7rxab978847jq8gr4zj4cnzgznhn44nzasgymj";
+      sha256 = "15zsax44g3dwjmmm4fpb54mvsjvjf3b6g3ijskgipvhcy0d3j938";
     };
 
     # We just want the consul api not all of consul and vault
@@ -618,7 +617,7 @@ let
       { inherit (vault) src goPackagePath; }
     ];
 
-    buildInputs = [ go-multierror go-syslog hcl logutils mapstructure ];
+    buildInputs = [ go-multierror go-syslog hcl logutils mapstructure pkgs.zip ];
   };
 
   context = buildGoPackage rec {
@@ -3918,10 +3917,10 @@ let
   };
 
   vault = buildFromGitHub {
-    rev = "v0.2.0";
+    rev = "v0.5.2";
     owner = "hashicorp";
     repo = "vault";
-    sha256 = "133fwhzk8z3xb6mf6scmn5rbl6g4vqg4g4n6zw620fsn9wy1b9ni";
+    sha256 = "085rk5i480wdlkn2p14yxi8zgsc11595nkkda1i77c4vjkllbkdy";
 
     #postPatch = ''
     #  grep -r '/gen/' | awk -F: '{print $1}' | xargs sed -i 's,/gen/,/apis/,g'