summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorDaniel Peebles <copumpkin@users.noreply.github.com>2017-02-02 17:42:07 +0100
committerGitHub <noreply@github.com>2017-02-02 17:42:07 +0100
commitff8a21e03cfa4ec3c62ad4db1b63abd53046823a (patch)
tree63f9ef219c5352cb91d1726ed3958bc552b73d0b /pkgs
parent7bc17013f83934de37d2c2eaf0b61a388d312aa4 (diff)
parent1d85e0bbab6a9f1b5a0d0a66c0ed927f6198f63b (diff)
downloadnixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar.gz
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar.bz2
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar.lz
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar.xz
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.tar.zst
nixpkgs-ff8a21e03cfa4ec3c62ad4db1b63abd53046823a.zip
Merge pull request #22348 from nand0p/hologram-module
hologram: 8d86e3f -> d20d1c3
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/security/hologram/default.nix18
-rw-r--r--pkgs/tools/security/hologram/deps.nix9
2 files changed, 22 insertions, 5 deletions
diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix
index e7673cf5842..abdcd5d2d3e 100644
--- a/pkgs/tools/security/hologram/default.nix
+++ b/pkgs/tools/security/hologram/default.nix
@@ -2,16 +2,24 @@
 
 buildGoPackage rec {
   name = "hologram-${version}";
-  version = "20160209-${stdenv.lib.strings.substring 0 7 rev}";
-  rev = "8d86e3fdcbfd967ba58d8de02f5e8173c101212e";
-
-  goPackagePath = "github.com/AdRoll/hologram";
+  version = "20170130-${stdenv.lib.strings.substring 0 7 rev}";
+  rev = "d20d1c30379e7010e8f9c428a5b9e82f54d390e1";
 
   src = fetchgit {
     inherit rev;
     url = "https://github.com/AdRoll/hologram";
-    sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf";
+    sha256 = "0dg5kfs16kf2gzhpmzsg83qzi2pxgnc9g81lw5zpa6fmzpa9kgsn";
   };
 
+  goPackagePath = "github.com/AdRoll/hologram";
+
   goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/AdRoll/hologram/;
+    description = "Easy, painless AWS credentials on developer laptops.";
+    maintainers = with maintainers; [ nand0p ];
+    platforms = platforms.all;
+    license = licenses.asl20;
+  };
 }
diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix
index 2c4cdbe84f0..a9b66da2a9c 100644
--- a/pkgs/tools/security/hologram/deps.nix
+++ b/pkgs/tools/security/hologram/deps.nix
@@ -98,4 +98,13 @@
       sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz";
     };
   }
+  {
+    goPackagePath = "github.com/aws/aws-sdk-go";
+    fetch = {
+      type = "git";
+      url = "https://github.com/aws/aws-sdk-go";
+      rev = "3f8f870ec9939e32b3372abf74d24e468bcd285d";
+      sha256 = "0a4hycs3d87s50z4prf5h6918r0fa2rvrrwlbffs430ilc4y8ghv";
+    };
+  }
 ]