From b4dd943f1635a7e8d2e440b703fa01c6c2126164 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 17 Jan 2013 12:39:48 +0100 Subject: bash: Update to 4.2-p42 --- pkgs/shells/bash/bash-4.2-patches.nix | 3 +++ pkgs/shells/bash/default.nix | 2 ++ 2 files changed, 5 insertions(+) (limited to 'pkgs/shells') diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix index e283c23990ee..52392f4b32c6 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 6191bb0f148e..c83cb96148b0 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" -- cgit 1.4.1