Merge branch 'master' into staging

Hydra: ?compare=1420346

2 files changed, 47 insertions, 2 deletions

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index aade96ed3899..51fff4c59ec1 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.18";
+  version = "1.8.19";
   name = "gnome-encfs-manager-${version}";
 
   src = fetchurl {
     url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.xz";
-    sha256 = "1rpf683lxa78fmxxb0hnq7vdh3yn7qid2gqq67q9mk65sp9vdhdj";
+    sha256 = "1h6x8dyp1fvxvr8fwki98ppf4sa20qf7g59jc9797b2vrgm60h1i";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
new file mode 100644
index 000000000000..d03c08211c2b
--- /dev/null
+++ b/pkgs/tools/security/gopass/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, makeWrapper }:
+
+buildGoPackage rec {
+  version = "1.6.6";
+  name = "gopass-${version}";
+
+  goPackagePath = "github.com/justwatchcom/gopass";
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchFromGitHub {
+    owner = "justwatchcom";
+    repo = "gopass";
+    rev = "v${version}";
+    sha256 = "0n3isjrjpn2cnlwfdkjdcz5j8n16dhyaw4zyjpmis51nl0bqd3jw";
+  };
+
+  wrapperPath = with stdenv.lib; makeBinPath ([
+    git
+    gnupg
+  ]);
+
+  postFixup = ''
+    wrapProgram $bin/bin/gopass \
+      --prefix PATH : "${wrapperPath}"
+  '';
+
+  meta = with stdenv.lib; {
+    description     = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go.";
+    homepage        = https://github.com/justwatchcom/gopass;
+    license         = licenses.mit;
+    maintainers     = with maintainers; [ andir ];
+    platforms       = platforms.unix;
+
+    longDescription = ''
+      gopass is a rewrite of the pass password manager in Go with the aim of
+      making it cross-platform and adding additional features. Our target
+      audience are professional developers and sysadmins (and especially teams
+      of those) who are well versed with a command line interface. One explicit
+      goal for this project is to make it more approachable to non-technical
+      users. We go by the UNIX philosophy and try to do one thing and do it
+      well, providing a stellar user experience and a sane, simple interface.
+    '';
+  };
+}