From bf2d73ca8471b8b1406ed8701422494963679ba4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sat, 11 Aug 2018 14:47:54 +0200
Subject: vault: 0.10.3 -> 0.10.4

---
 pkgs/tools/security/vault/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 2c422d516046..a9e8d8fca351 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -9,28 +9,26 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "vault-${version}";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    sha256 = "16sndzbfciw4bccxm7sc83y2pma2bgsmc1kqyb2hp0jsdy4rl3k4";
+    sha256 = "1f11arvj7zp8wwkvv3nn7kyga0ci8psdif6djrnzwjksskdgdbx5";
   };
 
   nativeBuildInputs = [ go gox removeReferencesTo ];
 
-  buildPhase = ''
+  preBuild = ''
     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
+    mkdir -p .git/hooks src/github.com/hashicorp
     ln -s $(pwd) src/github.com/hashicorp/vault
 
-    mkdir -p .git/hooks
-
-    GOPATH=$(pwd) make
+    export GOPATH=$(pwd)
   '';
 
   installPhase = ''
@@ -47,6 +45,6 @@ in stdenv.mkDerivation rec {
     description = "A tool for managing secrets";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.mpl20;
-    maintainers = with maintainers; [ rushmorem offline pradeepchhetri ];
+    maintainers = with maintainers; [ rushmorem lnl7 offline pradeepchhetri ];
   };
 }
-- 
cgit 1.4.1