diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2011-02-25 15:28:29 +0000 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2011-02-25 15:28:29 +0000 |
| commit | 0f1ba30626862bb4bf4b5e0fce50e6fda996e4a3 (patch) | |
| tree | 19ddfa548e217fb012317ea393f8befc008e5d50 /pkgs/shells | |
| parent | c1cfa5855610ffb36b146fb41df59574964f80bf (diff) | |
GNU Bash 4.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26119
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash/bash-patches.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/bash/default.nix | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/shells/bash/bash-patches.nix b/pkgs/shells/bash/bash-patches.nix index d22435744ccc9..b8019fb335024 100644 --- a/pkgs/shells/bash/bash-patches.nix +++ b/pkgs/shells/bash/bash-patches.nix @@ -1,6 +1,4 @@ # Automatically generated by `update-patch-set.sh'; do not edit. patch: [ -(patch "001" "0y02cbfnc5s3dnwr4fw2nz43f3b826f5084mk7qd0lzq12hpzr56") -(patch "002" "1y3qzw6lx16vnb8hrw3zx01z25k773cbmgysvs3vvcw6w6fj4bij") ] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index f29d4354a06ac..5de0a2fae7df5 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,7 +3,7 @@ assert interactive -> readline != null; let - realName = "bash-4.1"; + realName = "bash-4.2"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "1np1ggp1lv8idwfx3mcxl9rhadqdf4h3x4isa3dk8v9wm0j72qiz"; + sha256 = "1n5kbblp5ykbz5q8aq88lsif2z0gnvddg9babk33024wxiwi2ym2"; }; NIX_CFLAGS_COMPILE = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.1-patches/bash41-${nr}"; + url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}"; inherit sha256; }; in @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { license = "GPLv3+"; maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; }; passthru = { |