Merge pull request #107354 from lrworth/bash-5.1

bash: 5.0 -> 5.1
This commit is contained in:
Robert Hensing 2020-12-22 21:57:08 +01:00 committed by GitHub
commit 1a553d53c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 38 deletions

View file

@ -1,9 +1,15 @@
{ stdenv, buildPackages
, fetchurl, binutils ? null, bison, util-linux
{ stdenv
, buildPackages
, fetchurl
, binutils ? null
, bison
, util-linux
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin, readline80 ? null
, withDocs ? false, texinfo ? null
# patch for cygwin requires readline support
, interactive ? stdenv.isCygwin
, readline80 ? null
, withDocs ? false
, texinfo ? null
}:
with stdenv.lib;
@ -11,21 +17,19 @@ with stdenv.lib;
assert interactive -> readline80 != null;
assert withDocs -> texinfo != null;
assert stdenv.hostPlatform.isDarwin -> binutils != null;
let
upstreamPatches = import ./bash-5.0-patches.nix (nr: sha256: fetchurl {
url = "mirror://gnu/bash/bash-5.0-patches/bash50-${nr}";
upstreamPatches = import ./bash-5.1-patches.nix (nr: sha256: fetchurl {
url = "mirror://gnu/bash/bash-5.1-patches/bash51-${nr}";
inherit sha256;
});
in
stdenv.mkDerivation rec {
name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
version = "5.0";
version = "5.1";
src = fetchurl {
url = "mirror://gnu/bash/bash-${version}.tar.gz";
sha256 = "0kgvfwqdcd90waczf4gx39xnrxzijhjrzyzv7s8v4w31qqm0za5l";
sha256 = "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc";
};
hardeningDisable = [ "format" ];
@ -44,7 +48,7 @@ stdenv.mkDerivation rec {
patchFlags = [ "-p0" "-T" ];
patches = upstreamPatches
++ [ ./pgrp-pipe-5.0.patch ];
++ [ ./pgrp-pipe-5.1.patch ];
configureFlags = [
(if interactive then "--with-installed-readline" else "--disable-readline")
@ -87,7 +91,8 @@ stdenv.mkDerivation rec {
rm -f $out/lib/bash/Makefile.inc
'';
postFixup = if interactive
postFixup =
if interactive
then ''
substituteInPlace "$out/bin/bashbug" \
--replace '${stdenv.shell}' "$out/bin/bash"
@ -101,7 +106,7 @@ stdenv.mkDerivation rec {
homepage = "https://www.gnu.org/software/bash/";
description =
"GNU Bourne-Again Shell, the de facto standard shell on Linux" +
(if interactive then " (for interactive use)" else "");
(if interactive then " (for interactive use)" else "");
longDescription = ''
Bash is the shell, or command language interpreter, that will

View file

@ -1,22 +0,0 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "12bjfdy6bg8nhyw27bdgxn7h4paylx8d927skfmi9pxd1wgrxzpj")
(patch "002" "01w7yrzmz10mw06ys0546vhl7isv2v402ziyvfd7k67588spvs47")
(patch "003" "0ny81ridp5n0j69hb8ixrc7dmxybby54jbsz5hikly8kgg1wvssf")
(patch "004" "021gqqvgydixkrmqss64b6srfdlkvnx88lyfzpxfrn5d6bc7li0l")
(patch "005" "0xl2kyzm84nlyklrqzkn73ixabhzfhn9x91lzcmis89cppclvxav")
(patch "006" "0844749ixk1z60437nkznzms1f0nzh9an62kj7sny6r0zyk2k1fn")
(patch "007" "16xg37gp1b8zlj5969w8mcrparwqlcbj9695vn3qhgb7wdz1xd0p")
(patch "008" "1qyp19krjh8zxvb0jgwmyjz40djslwcf4xi7kc1ab0iaca44bipf")
(patch "009" "00yrjjqd95s81b21qq3ba1y7h879q8jaajlkjggc6grhcwbs4g7d")
(patch "010" "04ca5bjv456v538mkspzvn4xb2zdphh31r4fpvfm9p5my0jw7yyn")
(patch "011" "1sklyixvsv8993kxzs0jigacpdchjrq7jv5xpdx7kbqyp4rf6k9c")
(patch "012" "0cz21qg2gbr40lfgza7g02bqi2qknwqgxnq459pjj640d0cywhr9")
(patch "013" "16h9nwz3yzwj7fnxvlidjymdc4yr30h818433gh9j1x3in6igmzm")
(patch "014" "12gm5bvv2pd3m72z2ilj26pa08c61az253dsgfl24vpf2ijywvjx")
(patch "015" "0pm0px758w4i23s55wajcv6lqfiym7zgxvq0pxf6vclkv8nxy5x5")
(patch "016" "0vdha332km2iwx8g2ld15jy7d24cbplzgr1531dpzylr9ajxglgz")
(patch "017" "0cfw5lz3fcvq9h1fxihxvw940fjk68015jazvl8x8rlazgxbkwsc")
(patch "018" "1lw1vv0aj6x254hgx4klbz8qkvwxif0g6i7dx116cnhhb8vlwcbw")
]

View file

@ -0,0 +1,8 @@
# Automatically generated by `update-patch-set.sh'; do not edit.
patch: [
(patch "001" "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b")
(patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
(patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
(patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
]

View file

@ -8690,8 +8690,8 @@ in
any-nix-shell = callPackage ../shells/any-nix-shell { };
bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
bash_5 = lowPrio (callPackage ../shells/bash/5.0.nix { });
bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.0.nix {
bash_5 = lowPrio (callPackage ../shells/bash/5.1.nix { });
bashInteractive_5 = lowPrio (callPackage ../shells/bash/5.1.nix {
interactive = true;
withDocs = true;
});