diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-05-18 17:10:02 +0200 |
| commit | f8d481754cf842ca6e6ac1427ce0f571f5a44108 (patch) | |
| tree | 70e702285987429aed275e0d5e2dc15c050e1f8c /pkgs/shells/bash | |
| parent | 9fbc20e2f89bc045efac7ade41949a2c2d571dec (diff) | |
| parent | 3cd63ade1614d4c581735ffb0cebe181bf87dfc8 (diff) | |
| download | nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.gz nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.bz2 nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.lz nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.xz nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.tar.zst nixpkgs-f8d481754cf842ca6e6ac1427ce0f571f5a44108.zip | |
Merge remote-tracking branch 'origin/master' into hardened-stdenv
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 815b7bde73a..c6868eedba6 100644 --- a/pkgs/shells/bash/default.nix +++ b/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 = { |