diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index 07d4de24da6f..048281115338 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,13 +3,22 @@ assert interactive -> ncurses != null; stdenv.mkDerivation { - name = "bash-3.2-p39"; + name = "bash-3.2.48"; src = fetchurl { - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; + url = mirror://gnu/bash/bash-3.2.48.tar.gz; + sha256 = "1i81scw3mnfjbmsn3cjfdancyx3d0rg8gd9hpdfng9j83dbdrs98"; }; + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + postInstall = "ln -s bash $out/bin/sh"; patches = [ diff --git a/pkgs/shells/bash/new.nix b/pkgs/shells/bash/new.nix deleted file mode 100644 index beaf2f845e75..000000000000 --- a/pkgs/shells/bash/new.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: - -assert interactive -> ncurses != null; - -stdenv.mkDerivation { - name = "bash-3.2-p39"; - - src = fetchurl { - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; - }; - - NIX_CFLAGS_COMPILE = '' - -DSYS_BASHRC="/etc/bashrc" - -DSYS_BASH_LOGOUT="/etc/bash_logout" - -DDEFAULT_PATH_VALUE="/no-such-path" - -DSTANDARD_UTILS_PATH="/no-such-path" - -DNON_INTERACTIVE_LOGIN_SHELLS - -DSSH_SOURCE_BASHRC - ''; - - postInstall = "ln -s bash $out/bin/sh"; - - patches = [ - # For dietlibc builds. - ./winsize.patch - ]; - - # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) - buildInputs = [bison] - ++ stdenv.lib.optional (texinfo != null) texinfo - ++ stdenv.lib.optional interactive ncurses; - - meta = { - homepage = http://www.gnu.org/software/bash/; - description = - "GNU Bourne-Again Shell, the de facto standard shell on Linux" + - (if interactive then " (for interactive use)" else ""); - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f8ba0ccd92f..996dee41a30e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1378,7 +1378,7 @@ let inherit fetchurl stdenv bison; })); - bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix { + bashInteractive = appendToName "interactive" (import ../shells/bash { inherit fetchurl stdenv ncurses texinfo bison; interactive = true; });