Merge branch 'master' into closure-size

Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs

pkgs/tools/security/gnupg/20.nix

@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.29";
+  name = "gnupg-2.0.30";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
+    sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
   buildInputs

pkgs/tools/security/gnupg/gpgkey2ssh-20.patch

@@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
 index 903fb5b..d5611dc 100644
 --- a/tools/gpgkey2ssh.c
 +++ b/tools/gpgkey2ssh.c
-@@ -266,7 +266,7 @@ main (int argc, char **argv)
+@@ -268,7 +268,7 @@ main (int argc, char **argv)
    keyid = argv[1];
  
    ret = asprintf (&command,

pkgs/tools/security/pass/default.nix

@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   preInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
     mkdir -p "$out/share/zsh/site-functions"
-    mkdir -p "$out/share/fish/completions"
+    mkdir -p "$out/share/fish/vendor_completions.d"
   '';
 
   installFlags = [ "PREFIX=$(out)" ];

pkgs/tools/security/sshuttle/default.nix

@@ -3,10 +3,10 @@
   
 pythonPackages.buildPythonApplication rec {
   name = "sshuttle-${version}";
-  version = "0.77.2";
+  version = "0.78.0";
 
   src = fetchurl {
-    sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10";
+    sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
     url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
   };