diff options
| author | Peter Simons <simons@cryp.to> | 2011-09-28 14:48:34 +0000 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2011-09-28 14:48:34 +0000 |
| commit | 07a5a121fbde76ca50543c0bf7d9d048713dd517 (patch) | |
| tree | 75fa9cebe3b3891b4c6dcb0adaf4f03318b251cd /pkgs/shells/bash | |
| parent | 6a1bde84dc45349c9b3dcc6e8a1a519b7e9f6360 (diff) | |
| parent | dc55be9e050eea7c8ebd59acb7fd8963d7a31f56 (diff) | |
| download | nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar.gz nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar.bz2 nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar.lz nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar.xz nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.tar.zst nixpkgs-07a5a121fbde76ca50543c0bf7d9d048713dd517.zip | |
synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
Diffstat (limited to 'pkgs/shells/bash')
| -rw-r--r-- | pkgs/shells/bash/bash-4.2-patches.nix | 14 | ||||
| -rw-r--r-- | pkgs/shells/bash/bash-patches.nix | 4 | ||||
| -rw-r--r-- | pkgs/shells/bash/default.nix | 5 | ||||
| -rwxr-xr-x | pkgs/shells/bash/update-patch-set.sh | 2 |
4 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix new file mode 100644 index 00000000000..7f4957c500c --- /dev/null +++ b/pkgs/shells/bash/bash-4.2-patches.nix @@ -0,0 +1,14 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d") +(patch "002" "1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy") +(patch "003" "1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js") +(patch "004" "1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f") +(patch "005" "182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8") +(patch "006" "1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9") +(patch "007" "15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20") +(patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213") +(patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7") +(patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c") +] diff --git a/pkgs/shells/bash/bash-patches.nix b/pkgs/shells/bash/bash-patches.nix deleted file mode 100644 index b8019fb3350..00000000000 --- a/pkgs/shells/bash/bash-patches.nix +++ /dev/null @@ -1,4 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 529c7334b49..98fe43b0122 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"; + sha256 = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8"; }; NIX_CFLAGS_COMPILE = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import ./bash-patches.nix patch; + import ./bash-4.2-patches.nix patch; crossAttrs = { configureFlags = baseConfigureFlags + @@ -73,7 +73,6 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.simons ]; - platforms = stdenv.lib.platforms.all; }; passthru = { diff --git a/pkgs/shells/bash/update-patch-set.sh b/pkgs/shells/bash/update-patch-set.sh index ded684571b0..003c7a26d20 100755 --- a/pkgs/shells/bash/update-patch-set.sh +++ b/pkgs/shells/bash/update-patch-set.sh @@ -16,7 +16,7 @@ VERSION="$2" VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)" GPG="$(if $(type -P gpg2 > /dev/null); then echo gpg2; else echo gpg; fi)" -PATCH_LIST="$PROJECT-patches.nix" +PATCH_LIST="$PROJECT-$VERSION-patches.nix" set -e |