From 46f5efa0182beaa2dee5fd6ec335e791d83a4e9f Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Fri, 26 Jun 2015 00:31:57 +0300
Subject: [PATCH 1/2] Add myself as maintainer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index eb5dcbf4313..c1e25d40d10 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -31,6 +31,7 @@
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
   auntie = "Jonathan Glines <auntieNeo@gmail.com>";
+  avnik = "Alexander V. Nikolaev <avn@avnik.info>";
   aycanirican = "Aycan iRiCAN <iricanaycan@gmail.com>";
   balajisivaraman = "Balaji Sivaraman<sivaraman.balaji@gmail.com>";
   bbenoist = "Baptist BENOIST <return_0@live.com>";

From 41bbb904ebc930cd35558b299519a3c963b62929 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@daemon.hole.ru>
Date: Fri, 26 Jun 2015 00:33:02 +0300
Subject: [PATCH 2/2] vault: init at v0.1.2

---
 pkgs/servers/vault/default.nix  | 48 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/servers/vault/default.nix

diff --git a/pkgs/servers/vault/default.nix b/pkgs/servers/vault/default.nix
new file mode 100644
index 00000000000..ddaaca8083b
--- /dev/null
+++ b/pkgs/servers/vault/default.nix
@@ -0,0 +1,48 @@
+{ 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 3fe7ae37b21..85f4265d4ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14776,6 +14776,8 @@ let
 
   utf8proc = callPackage ../development/libraries/utf8proc { };
 
+  vault = callPackage ../servers/vault {};
+
   vbam = callPackage ../misc/emulators/vbam {
     inherit (xlibs) libpthreadstubs;
   };