Merge remote-tracking branch 'master' into staging.

pkgs/tools/security/gnupg/21.nix

@@ -5,11 +5,11 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.1";
+  name = "gnupg-2.1.2";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "0jffj23a02gw7gmrh9j9ynp50bvl2pc2y74i9ii65nvm50fx1v3h";
+    sha256 = "14k7c5spai3yppz6izf1ggbnffskl54ln87v1wgy9pwism1mlks0";
   };
 
   patches = [ ./socket-activate-2.1.1.patch ];

pkgs/tools/security/kpcli/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation rec {
-  version = "2.7";
+  version = "2.8";
   name = "kpcli-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/kpcli/${name}.pl";
-    sha256 = "6bb1f7320b4474d6dbb73915393e5df96862f27c6228aa042a810fef46e2b777";
+    sha256 = "1vmj131ii3skm1dx0pmcvq19h6a94a2vjldmqlf1b3dxjvz1ld91";
   };
 
   buildInputs = [ makeWrapper perl ];

pkgs/tools/security/pass/default.nix

@@ -35,13 +35,15 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  installPhase = ''
-    PREFIX="$out" make install
-
+  preInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
     mkdir -p "$out/share/zsh/site-functions"
     mkdir -p "$out/share/fish/completions"
+  '';
 
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
     # Install Emacs Mode. NOTE: We can't install the necessary
     # dependencies (s.el and f.el) here. The user has to do this
     # himself.