diff options
| author | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2015-02-02 21:14:28 -0500 |
| commit | c45372f038bc89c69390bdbc6a4b0bfdb63b1423 (patch) | |
| tree | dc8ebe44d7a1ad0dc01b938199db38ebc14fbdfb /pkgs/shells | |
| parent | acbf8eb5617bb601e81cdc783f941773032cf400 (diff) | |
| parent | cfb29ab882323d379aba20a95020c7c24f883eae (diff) | |
| download | nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.gz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.bz2 nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.lz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.xz nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.tar.zst nixlib-c45372f038bc89c69390bdbc6a4b0bfdb63b1423.zip | |
Merge commit 'cfb29ab882323d379aba20a95020c7c24f883eae'
Partial staging merge, including cc-wrapper fixes Conflicts: pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/bash-4.3-patches.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix index cd1fb578e62b..49360bd9a026 100644 --- a/pkgs/shells/bash/bash-4.3-patches.nix +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -31,4 +31,7 @@ patch: [ (patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") (patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") (patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") +(patch "031" "07d62bl3z7qa8v6kgk47vzzazw563mlk9zhrsr4xsbqgvmcrylnd") +(patch "032" "0jjgapfq4qhmndfrw8c3q3lva8xjdhlbd9cc631v41b0kb95g4w8") +(patch "033" "05ma5rlxiadnfh925p4y7s0vvk917kmsdb1mfdx05gizl63pfapv") ] |