summary refs log tree commit diff
path: root/pkgs/shells
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2014-08-08 20:13:23 +0200
committerVladimír Čunát <vcunat@gmail.com>2014-08-08 20:13:23 +0200
commit52d9c93abef582cfa32d94397aa86f0aa169917c (patch)
treefd32d1eb551687c92a10487a0a877018791b73ff /pkgs/shells
parent629f7d055a8ec6815400affbfdd0a9f3384b0e2a (diff)
parent777617f987c1e3e44f0f399582bc1b2e2f113c42 (diff)
downloadnixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.gz
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.bz2
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.lz
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.xz
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.tar.zst
nixlib-52d9c93abef582cfa32d94397aa86f0aa169917c.zip
Merge 'staging' into master
Diffstat (limited to 'pkgs/shells')
-rw-r--r--pkgs/shells/bash/bash-4.2-patches.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix
index ac6e9e97f180..567ec3c551cf 100644
--- a/pkgs/shells/bash/bash-4.2-patches.nix
+++ b/pkgs/shells/bash/bash-4.2-patches.nix
@@ -46,4 +46,6 @@ patch: [
 (patch "043" "0mswgjk3z80qm1mb93jmbql27nbczxk86cw5byf0m29y1y2869nw")
 (patch "044" "1rk6jywzfvg1crvhib1zk37rsps73minhr7l4vcb3vfdkin2vlqh")
 (patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx")
+(patch "046" "0vc1ngkxkamwr022ww3vjp9ww9c647az4pjn175c1v60d0xk5hcm")
+(patch "047" "0ymgimqz65sx2izg1dvm1h5cc01arl3j9j5137212l1ls00r55y1")
 ]