lol

* Bash 3.2.48.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13876

+13 -44
+12 -3
pkgs/shells/bash/default.nix
··· 3 3 assert interactive -> ncurses != null; 4 4 5 5 stdenv.mkDerivation { 6 - name = "bash-3.2-p39"; 6 + name = "bash-3.2.48"; 7 7 8 8 src = fetchurl { 9 - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; 10 - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; 9 + url = mirror://gnu/bash/bash-3.2.48.tar.gz; 10 + sha256 = "1i81scw3mnfjbmsn3cjfdancyx3d0rg8gd9hpdfng9j83dbdrs98"; 11 11 }; 12 + 13 + NIX_CFLAGS_COMPILE = '' 14 + -DSYS_BASHRC="/etc/bashrc" 15 + -DSYS_BASH_LOGOUT="/etc/bash_logout" 16 + -DDEFAULT_PATH_VALUE="/no-such-path" 17 + -DSTANDARD_UTILS_PATH="/no-such-path" 18 + -DNON_INTERACTIVE_LOGIN_SHELLS 19 + -DSSH_SOURCE_BASHRC 20 + ''; 12 21 13 22 postInstall = "ln -s bash $out/bin/sh"; 14 23
-40
pkgs/shells/bash/new.nix
··· 1 - {stdenv, fetchurl, bison, interactive ? false, ncurses ? null, texinfo ? null}: 2 - 3 - assert interactive -> ncurses != null; 4 - 5 - stdenv.mkDerivation { 6 - name = "bash-3.2-p39"; 7 - 8 - src = fetchurl { 9 - url = http://nixos.org/tarballs/bash-3.2-p39.tar.bz2; 10 - sha256 = "075qs6nfjql57y8ffg3f4glb3l5yl3xy5hny75x6kpwxkqlcxqfy"; 11 - }; 12 - 13 - NIX_CFLAGS_COMPILE = '' 14 - -DSYS_BASHRC="/etc/bashrc" 15 - -DSYS_BASH_LOGOUT="/etc/bash_logout" 16 - -DDEFAULT_PATH_VALUE="/no-such-path" 17 - -DSTANDARD_UTILS_PATH="/no-such-path" 18 - -DNON_INTERACTIVE_LOGIN_SHELLS 19 - -DSSH_SOURCE_BASHRC 20 - ''; 21 - 22 - postInstall = "ln -s bash $out/bin/sh"; 23 - 24 - patches = [ 25 - # For dietlibc builds. 26 - ./winsize.patch 27 - ]; 28 - 29 - # !!! Bison is only needed for bash-3.2 (because of bash32-001.patch) 30 - buildInputs = [bison] 31 - ++ stdenv.lib.optional (texinfo != null) texinfo 32 - ++ stdenv.lib.optional interactive ncurses; 33 - 34 - meta = { 35 - homepage = http://www.gnu.org/software/bash/; 36 - description = 37 - "GNU Bourne-Again Shell, the de facto standard shell on Linux" + 38 - (if interactive then " (for interactive use)" else ""); 39 - }; 40 - }
+1 -1
pkgs/top-level/all-packages.nix
··· 1378 1378 inherit fetchurl stdenv bison; 1379 1379 })); 1380 1380 1381 - bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix { 1381 + bashInteractive = appendToName "interactive" (import ../shells/bash { 1382 1382 inherit fetchurl stdenv ncurses texinfo bison; 1383 1383 interactive = true; 1384 1384 });