diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-03-20 16:47:13 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-03-20 16:47:13 +0100 |
| commit | 48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855 (patch) | |
| tree | 7a001a763db651aa200a6d1b83acc4d65e566708 /pkgs/shells/bash | |
| parent | c7a6b5ea172e5e02705c46da3e1205e445df7bdb (diff) | |
| download | nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar.gz nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar.bz2 nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar.lz nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar.xz nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.tar.zst nixpkgs-48bc3cf9f497f38d0bfcf0ac6a808a1cd411a855.zip | |
bash: 4.4p5 -> 4.4p12
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/4.4.nix | 7 | ||||
| -rw-r--r-- | pkgs/shells/bash/bash-4.4-patches.nix | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix index 682123d924e..988b4f711cb 100644 --- a/pkgs/shells/bash/4.4.nix +++ b/pkgs/shells/bash/4.4.nix @@ -52,13 +52,6 @@ stdenv.mkDerivation rec { patchFlags = "-p0"; patches = upstreamPatches - ++ [ (fetchurl { - # https://security.gentoo.org/glsa/201701-02 - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-shells" - + "/bash/files/bash-4.4-popd-offset-overflow.patch" - + "?id=1bf1ceeb04a2f57e1e5e1636a8c288c4d0db6682"; - sha256 = "02n08lw5spvsc2b1bll0gr6mg4qxcg7pzfjkw7ji5w7bjcikccbm"; - }) ] ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix index c3ef5470aeb..741fb675d61 100644 --- a/pkgs/shells/bash/bash-4.4-patches.nix +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -6,4 +6,11 @@ patch: [ (patch "003" "1chqww2rj6g42b8s60q5zlzy0jzp684jkpsbrbfy1vzxja8mmpsi") (patch "004" "1cy8abf96hkrjhw921ndr0shlcnc52bg45rn6xri4v5clhq0l25d") (patch "005" "0a8515kyk4zsgmvlqvlganjfr7pq0j6kzpr4d6xx02kpbdr4n7i2") +(patch "006" "1f24wgqngmj2mrj9yibwvc2zvlmn5xi53mnw777g3l40c4m2x3ka") +(patch "007" "1bzdsnqaf05gdbqpsixhan8vygjxpcxlz1dd8d9f5jdznw3wq76y") +(patch "008" "1firw915mjm03hbbw9a70ch3cpgrgnvqjpllgdnn6csr8q04f546") +(patch "009" "0g1l56kvw61rpw7dqa9fcl9llkl693h73g631hrhxlm030ddssqb") +(patch "010" "01lfhrkdsdkdz8ypzapr614ras23x7ckjnr60aa5bzkaqprccrc4") +(patch "011" "038p7mhnq9m65g505hi3827jkf9f35nd1cy00w8mwafpyxp44mnx") +(patch "012" "0gh6lbb1rwpk44pvbamm6vzdfi50xnwkqd9v7s8cjwk3pz973hps") ] |