From f473582a754df80197677548b31ed6e074d276a7 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Sat, 4 Jun 2016 19:37:12 +0200
Subject: [PATCH] hologram: extracted from goPackages

---
 pkgs/development/go-modules/libs.json    | 84 ++++++++++++++++++++++--
 pkgs/tools/security/hologram/default.nix | 20 ++++++
 pkgs/tools/security/hologram/deps.json   | 19 ++++++
 pkgs/top-level/all-packages.nix          |  2 +-
 pkgs/top-level/go-packages.nix           | 14 ----
 5 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/tools/security/hologram/default.nix
 create mode 100644 pkgs/tools/security/hologram/deps.json

diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json
index 84093998b513..c8d09952d238 100644
--- a/pkgs/development/go-modules/libs.json
+++ b/pkgs/development/go-modules/libs.json
@@ -67,8 +67,8 @@
     "fetch": {
       "type": "git",
       "url": "https://github.com/golang/protobuf",
-      "rev": "dda510ac0fd43b39770f22ac6260eb91d377bce3",
-      "sha256": "0bmz87is9zvxvzycp3135l61ippjw6vmpjz0b9pq8gpxx6sj2vj4"
+      "rev": "59b73b37c1e45995477aae817e4a653c89a858db",
+      "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"
     }
   },
   {
@@ -885,9 +885,9 @@
     "goPackagePath": "golang.org/x/crypto",
     "fetch": {
       "type": "git",
-      "url": "https://github.com/hashicorp/go.net",
-      "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29",
-      "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"
+      "url": "https://go.googlesource.com/crypto",
+      "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6",
+      "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"
     }
   },
   {
@@ -907,5 +907,77 @@
       "rev": "01a738558a47fbf16712994d1737fb31c77e7d11",
       "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"
     }
+  },
+  {
+    "goPackagePath": "github.com/aybabtme/rgbterm",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/aybabtme/rgbterm",
+      "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283",
+      "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"
+    }
+  },
+  {
+    "goPackagePath": "github.com/vaughan0/go-ini",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/vaughan0/go-ini",
+      "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1",
+      "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mitchellh/go-homedir",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mitchellh/go-homedir",
+      "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4",
+      "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/goamz/goamz",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/goamz/goamz",
+      "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7",
+      "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nmcclain/asn1-ber",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-asn1-ber/asn1-ber",
+      "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+      "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/asn1-ber.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-asn1-ber/asn1-ber",
+      "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72",
+      "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"
+    }
+  },
+  {
+    "goPackagePath": "github.com/peterbourgon/g2s",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/peterbourgon/g2s",
+      "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc",
+      "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"
+    }
+  },
+  {
+    "goPackagePath": "github.com/nmcclain/ldap",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/go-ldap/ldap",
+      "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29",
+      "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"
+    }
   }
-]
\ No newline at end of file
+]
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
new file mode 100644
index 000000000000..d73827f636b4
--- /dev/null
+++ b/pkgs/tools/security/hologram/default.nix
@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with goPackages;
+
+buildGoPackage rec {
+  name = "hologram-${version}";
+  version = "20160209-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
+
+  goPackagePath = "github.com/AdRoll/hologram";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/AdRoll/hologram";
+    sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
+  };
+
+  goDeps = ./deps.json;
+}
diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json
new file mode 100644
index 000000000000..177c960933e8
--- /dev/null
+++ b/pkgs/tools/security/hologram/deps.json
@@ -0,0 +1,19 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/aybabtme/rgbterm",
+      "github.com/vaughan0/go-ini",
+      "github.com/howeyc/gopass",
+      "github.com/AdRoll/hologram",
+      "github.com/mitchellh/go-homedir",
+      "github.com/goamz/goamz",
+      "github.com/nmcclain/asn1-ber",
+      "gopkg.in/asn1-ber.v1",
+      "github.com/peterbourgon/g2s",
+      "github.com/nmcclain/ldap",
+      "github.com/golang/protobuf",
+      "golang.org/x/crypto"
+    ]
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 195948b2384c..05937021cf4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16180,7 +16180,7 @@ in
     camlp5 = ocamlPackages.camlp5_strict;
   };
 
-  hologram = goPackages.hologram.bin // { outputs = [ "bin" ]; };
+  hologram = callPackage ../tools/security/hologram { };
 
   tini = callPackage ../applications/virtualization/tini {};
 
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 31f699984547..686520621752 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1977,20 +1977,6 @@ let
     '';
   };
 
-  hologram = buildGoPackage rec {
-    rev  = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
-    name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
-    goPackagePath = "github.com/AdRoll/hologram";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner  = "AdRoll";
-      repo   = "hologram";
-      sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
-    };
-    buildInputs = [ crypto protobuf goamz rgbterm go-bindata go-homedir ldap g2s gox gopass ];
-  };
-
   http-authentication = buildFromGitHub {
     rev    = "3eca13d6893afd7ecabe15f4445f5d2872a1b012";
     owner  = "jimstudt";