forked from mirrors/nixpkgs
bash: switch the default 4.3 -> 4.4
... and remove the now-unused 4.3 expression.
This commit is contained in:
Vladimír Čunát
parent
57fc4d21b7
commit
f803270b7e
pkgs
|
|
@ -1,127 +0,0 @@
|
||||||
{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, binutils ? null, bison }:
|
|
||||||
|
|
||||||
assert interactive -> readline != null;
|
|
||||||
assert stdenv.isDarwin -> binutils != null;
|
|
||||||
|
|
||||||
let
|
|
||||||
version = "4.3";
|
|
||||||
realName = "bash-${version}";
|
|
||||||
shortName = "bash43";
|
|
||||||
baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
|
|
||||||
sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
|
|
||||||
|
|
||||||
upstreamPatches =
|
|
||||||
let
|
|
||||||
patch = nr: sha256:
|
|
||||||
fetchurl {
|
|
||||||
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
in
|
|
||||||
import ./bash-4.3-patches.nix patch;
|
|
||||||
|
|
||||||
inherit (stdenv.lib) optional optionalString;
|
|
||||||
in
|
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
|
||||||
name = "${realName}-p${toString (builtins.length upstreamPatches)}";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
url = "mirror://gnu/bash/${realName}.tar.gz";
|
|
||||||
inherit sha256;
|
|
||||||
};
|
|
||||||
|
|
||||||
hardeningDisable = [ "format" ];
|
|
||||||
|
|
||||||
outputs = [ "out" "doc" "info" ];
|
|
||||||
|
|
||||||
# the man pages are small and useful enough
|
|
||||||
outputMan = if interactive then "out" else null;
|
|
||||||
|
|
||||||
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
|
|
||||||
'';
|
|
||||||
|
|
||||||
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 = {
|
|
||||||
configureFlags = baseConfigureFlags +
|
|
||||||
" bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
|
|
||||||
optionalString stdenv.isCygwin ''
|
|
||||||
--without-libintl-prefix --without-libiconv-prefix
|
|
||||||
--with-installed-readline
|
|
||||||
bash_cv_dev_stdin=present
|
|
||||||
bash_cv_dev_fd=standard
|
|
||||||
bash_cv_termcap_lib=libncurses
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
configureFlags = baseConfigureFlags;
|
|
||||||
|
|
||||||
# Note: Bison is needed because the patches above modify parse.y.
|
|
||||||
nativeBuildInputs = [bison]
|
|
||||||
++ optional (texinfo != null) texinfo
|
|
||||||
++ optional interactive readline
|
|
||||||
++ optional stdenv.isDarwin binutils;
|
|
||||||
|
|
||||||
# Bash randomly fails to build because of a recursive invocation to
|
|
||||||
# build `version.h'.
|
|
||||||
enableParallelBuilding = false;
|
|
||||||
|
|
||||||
postInstall = ''
|
|
||||||
ln -s bash "$out/bin/sh"
|
|
||||||
'';
|
|
||||||
|
|
||||||
postFixup = if interactive
|
|
||||||
then ''
|
|
||||||
substituteInPlace "$out/bin/bashbug" \
|
|
||||||
--replace '${stdenv.shell}' "$out/bin/bash"
|
|
||||||
''
|
|
||||||
# most space is taken by locale data
|
|
||||||
else ''
|
|
||||||
rm -r "$out/share" "$out/bin/bashbug"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
|
||||||
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 "");
|
|
||||||
|
|
||||||
longDescription = ''
|
|
||||||
Bash is the shell, or command language interpreter, that will
|
|
||||||
appear in the GNU operating system. Bash is an sh-compatible
|
|
||||||
shell that incorporates useful features from the Korn shell
|
|
||||||
(ksh) and C shell (csh). It is intended to conform to the IEEE
|
|
||||||
POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers
|
|
||||||
functional improvements over sh for both programming and
|
|
||||||
interactive use. In addition, most sh scripts can be run by
|
|
||||||
Bash without modification.
|
|
||||||
'';
|
|
||||||
|
|
||||||
license = licenses.gpl3Plus;
|
|
||||||
|
|
||||||
platforms = platforms.all;
|
|
||||||
|
|
||||||
maintainers = [ maintainers.peti ];
|
|
||||||
};
|
|
||||||
|
|
||||||
passthru = {
|
|
||||||
shellPath = "/bin/bash";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -4544,7 +4544,7 @@ in
|
||||||
|
|
||||||
### SHELLS
|
### SHELLS
|
||||||
|
|
||||||
bash = lowPrio (callPackage ../shells/bash/4.3.nix {
|
bash = lowPrio (callPackage ../shells/bash/4.4.nix {
|
||||||
texinfo = null;
|
texinfo = null;
|
||||||
interactive = stdenv.isCygwin; # patch for cygwin requires readline support
|
interactive = stdenv.isCygwin; # patch for cygwin requires readline support
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue