Merge staging-next into staging

pkgs/tools/admin/awscli/default.nix

@@ -28,11 +28,11 @@ let
 
 in with py.pkgs; buildPythonApplication rec {
   pname = "awscli";
-  version = "1.18.191"; # N.B: if you change this, change botocore to a matching version too
+  version = "1.18.195"; # N.B: if you change this, change botocore to a matching version too
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1zsb9w0bpbwq093ydbh4b5r3287b5l9mrdx549vsv0rspmkr0d7c";
+    sha256 = "1969rzcqj3k81k0wbvq8fpklx1z9vjh6db7i81mkbqqfkjm9pq2k";
   };
 
   postPatch = ''

pkgs/tools/security/gopass/default.nix

@@ -46,10 +46,12 @@ buildGoModule rec {
     ln -s $out/bin/gopass $out/bin/pass
   '';
 
+  # --run to work around WONTFIX in https://github.com/gopasspw/gopass/issues/1662
   postFixup = ''
     for bin in $out/bin/*; do
       wrapProgram $bin \
-        --prefix PATH : "${wrapperPath}"
+        --prefix PATH : "${wrapperPath}" \
+        --run 'rm -f "''${XDG_CONFIG_HOME:-~/.config}/gopass/gpg-binary.loc"'
     done
   '';