Merge remote-tracking branch 'origin/master' into hardened-stdenv

pkgs/shells/bash/default.nix

@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
-  outputs = if (!interactive) # conditional to avoid mass rebuild ATM
-    then [ "out" "doc" ]
-    else [ "out" "doc" "info" ];
+  outputs = [ "out" "doc" "info" ];
 
   # the man pages are small and useful enough
   outputMan = if interactive then "out" else null;
@@ -111,7 +109,7 @@ stdenv.mkDerivation rec {
 
     platforms = platforms.all;
 
-    maintainers = [ maintainers.simons ];
+    maintainers = [ maintainers.peti ];
   };
 
   passthru = {