summary refs log tree commit diff
path: root/pkgs/shells/bash
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-17 12:39:48 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-01-17 12:39:48 +0100
commitb4dd943f1635a7e8d2e440b703fa01c6c2126164 (patch)
tree1baffd00f665e6b8d7f7b89e535a93d100a36911 /pkgs/shells/bash
parent0890c454986993a262a31aa2779e9269b7d58952 (diff)
downloadnixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar.gz
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar.bz2
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar.lz
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar.xz
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.tar.zst
nixpkgs-b4dd943f1635a7e8d2e440b703fa01c6c2126164.zip
bash: Update to 4.2-p42
Diffstat (limited to 'pkgs/shells/bash')
-rw-r--r--pkgs/shells/bash/bash-4.2-patches.nix3
-rw-r--r--pkgs/shells/bash/default.nix2
2 files changed, 5 insertions, 0 deletions
diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix
index e283c23990e..52392f4b32c 100644
--- a/pkgs/shells/bash/bash-4.2-patches.nix
+++ b/pkgs/shells/bash/bash-4.2-patches.nix
@@ -40,4 +40,7 @@ patch: [
 (patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7")
 (patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq")
 (patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl")
+(patch "040" "0v5a98ybibwsd4iyh18gy0kc51mx8qn9w2wfpjaiycn7yg5gjrdj")
+(patch "041" "1szmm8xv41hvbzgxfwrj6dg85wa7zy3781nnil428rlzpm8ikk05")
+(patch "042" "017kpdqy6v9sgi2a931wyzpix86n9mkalpm6n9cb45v58lgmraps")
 ]
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 6191bb0f148..c83cb96148b 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (texinfo != null) texinfo
     ++ stdenv.lib.optional interactive readline;
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"