Merge pull request #32300 from adisbladis/vault-0_9_0

vault: 0.8.3 -> 0.9.0

3 files changed, 20 insertions, 12 deletions

diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix
index 92bb619be70a..65bc55c6d8d7 100644
--- a/pkgs/development/tools/gox/default.nix
+++ b/pkgs/development/tools/gox/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
 
 buildGoPackage rec {
   name = "gox-${version}";
-  version = "20140904-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "e8e6fd4fe12510cc46893dff18c5188a6a6dc549";
+  version = "0.4.0";
 
-  
   goPackagePath = "github.com/mitchellh/gox";
 
-  src = fetchgit {
-    inherit rev;
-    url = "https://github.com/mitchellh/gox";
-    sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1";
+  src = fetchFromGitHub {
+    owner = "mitchellh";
+    repo = "gox";
+    rev = "v${version}";
+    sha256 = "1q4fdkw904mrmh1q5z8pfd3r0gcn5dm776kldqawddy93iiwnp8r";
   };
 
   goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/mitchellh/gox;
+    description = "A dead simple, no frills Go cross compile tool";
+    platforms = platforms.all;
+    license = licenses.mpl20;
+  };
+
 }
diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix
index d15b8e7c0916..c4991e38ff02 100644
--- a/pkgs/development/tools/gox/deps.nix
+++ b/pkgs/development/tools/gox/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/mitchellh/iochan";
-      rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-      sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
+      rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
+      sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
     };
   }
 ]
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index bfb0dd11b8ed..002400e2c94b 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,13 +9,13 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "1dcmqbcdkj42614am2invb6wf8v29z4sp4d354a4d83rwhyb0qly";
+    sha256 = "1c3jaajf3wpjczbncvdpyy5vaa62gb9287bj2zi2khvqzvii36b0";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
@@ -23,6 +23,7 @@ in stdenv.mkDerivation rec {
   buildPhase = ''
     patchShebangs ./
     substituteInPlace scripts/build.sh --replace 'git rev-parse HEAD' 'echo ${src.rev}'
+    sed -i s/'^GIT_DIRTY=.*'/'GIT_DIRTY="+NixOS"'/ scripts/build.sh
 
     mkdir -p src/github.com/hashicorp
     ln -s $(pwd) src/github.com/hashicorp/vault