From 2c2a4cd099329c99736b6a5cf9733d9d661b8b9e Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Mon, 10 Aug 2015 14:18:15 +0300
Subject: [PATCH 1/2] Revert "vault: init at v0.1.2"

This reverts commit 41bbb904ebc930cd35558b299519a3c963b62929.
---
 pkgs/servers/vault/default.nix  | 48 ---------------------------------
 pkgs/top-level/all-packages.nix |  2 --
 2 files changed, 50 deletions(-)
 delete mode 100644 pkgs/servers/vault/default.nix

diff --git a/pkgs/servers/vault/default.nix b/pkgs/servers/vault/default.nix
deleted file mode 100644
index ddaaca8083be..000000000000
--- a/pkgs/servers/vault/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchgit, go, gox }:
-
-let
-  name = "vault";
-  version = "0.1.2";
-  namespace = "github.com/hashicorp/vault";
-in
-stdenv.mkDerivation rec {
-  name = "vault-${version}";
-  rev = "v${version}";
-
-  src = fetchgit {
-    url = "https://github.com/hashicorp/vault";
-    sha256 = "a4267105dab56c6d0571f69ea0abc167c5debd3b6c0795b8b69e15a285e12f01";
-    rev = "refs/tags/${rev}";
-  };
-
-  buildInputs = [ go gox ];
-
-  buildPhase = ''
-    mkdir -p "$(dirname Godeps/_workspace/src/${namespace})"
-    ln -sf $src "Godeps/_workspace/src/${namespace}"
-    export GOPATH=$PWD/Godeps/_workspace
-    XC_OS=$(go env GOOS)
-    XC_ARCH=$(go env GOARCH)
-    mkdir -p bin/
-    gox \
-      -os "$XC_OS" \
-      -arch "$XC_ARCH" \
-      -ldflags "-X github.com/hashicorp/vault/cli.GitCommit ${rev}" \
-      -output $PWD/bin/vault \
-      -verbose \
-      .
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp bin/vault $out/bin/vault
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "https://www.vaultproject.io";
-    description = "A tool for securely accessing secrets";
-    maintainers = with maintainers; [ avnik ];
-    license     = licenses.mit ;
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4c13aa8cfe1..1b7a41250de8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15032,8 +15032,6 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
-  vault = callPackage ../servers/vault {};
-
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };

From 2d0286f8f25e0df8eded78ee1da39bef95b2059d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Mon, 10 Aug 2015 14:18:40 +0300
Subject: [PATCH 2/2] vault: Propagate from goPackages to top-level

---
 pkgs/top-level/all-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b7a41250de8..913949edea24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15032,6 +15032,8 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
+  vault = goPackages.vault;
+
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };