mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 14:54:29 +01:00
Merge pull request #39457 from oxij/stdenv/texinfo-bash
stdenv: change texinfo bootstrap handling; texinfo, bash: simplify expressions
This commit is contained in:
Michael Raskin
GitHub
commit
ce929e6a92
8 changed files with 144 additions and 209 deletions
|
|
@ -1,10 +1,11 @@
|
|||
{ stdenv, fetchurl, ncurses, lzma }:
|
||||
{ stdenv, fetchurl, texinfo, ncurses, lzma }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-4.13a";
|
||||
name = "texinfo-${version}";
|
||||
version = "4.13a";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/texinfo-4.13a.tar.lzma";
|
||||
url = "mirror://gnu/texinfo/${name}.tar.lzma";
|
||||
sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
|
||||
};
|
||||
|
||||
|
|
@ -14,29 +15,5 @@ stdenv.mkDerivation rec {
|
|||
# Disabled because we don't have zdiff in the stdenv bootstrap.
|
||||
#doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "The GNU documentation system";
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
branch = "4.13";
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
};
|
||||
meta = texinfo.meta // { branch = version; };
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,54 +1,4 @@
|
|||
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, procps, interactive ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-5.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/${name}.tar.xz";
|
||||
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ perl xz.bin ]
|
||||
++ optional interactive ncurses
|
||||
++ optional doCheck procps; # for tests
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = !stdenv.isDarwin;
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
branch = "5.2";
|
||||
};
|
||||
import ./common.nix {
|
||||
version = "5.2";
|
||||
sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,56 +1,4 @@
|
|||
{ stdenv, buildPackages, fetchurl, ncurses, perl, xz, libiconv, gawk, procps, interactive ? false }:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-6.5";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/${name}.tar.xz";
|
||||
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ xz ]
|
||||
++ optionals stdenv.isSunOS [ libiconv gawk ]
|
||||
++ optional interactive ncurses
|
||||
++ optional doCheck procps; # for tests
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = interactive # simplify bootstrapping
|
||||
&& !stdenv.isDarwin && !stdenv.isSunOS/*flaky*/;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = [ maintainers.vrthra ];
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
};
|
||||
import ./common.nix {
|
||||
version = "6.5";
|
||||
sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
|
||||
}
|
||||
|
|
|
|||
64
pkgs/development/tools/misc/texinfo/common.nix
Normal file
64
pkgs/development/tools/misc/texinfo/common.nix
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
{ version, sha256 }:
|
||||
|
||||
{ stdenv, buildPackages, fetchurl, perl, xz
|
||||
|
||||
# we are a dependency of gcc, this simplifies bootstraping
|
||||
, interactive ? false, ncurses, procps
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "texinfo-${optionalString interactive "interactive-"}${version}";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
# We need a native compiler to build perl XS extensions
|
||||
# when cross-compiling.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc perl ];
|
||||
|
||||
buildInputs = [ xz.bin ]
|
||||
++ optionals stdenv.isSunOS [ libiconv gawk ]
|
||||
++ optionals interactive [ ncurses procps ];
|
||||
|
||||
configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
|
||||
++ stdenv.lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
|
||||
|
||||
preInstall = ''
|
||||
installFlags="TEXMF=$out/texmf-dist";
|
||||
installTargets="install install-tex";
|
||||
'';
|
||||
|
||||
doCheck = interactive
|
||||
&& !stdenv.isDarwin
|
||||
&& !stdenv.isSunOS; # flaky
|
||||
|
||||
meta = {
|
||||
homepage = http://www.gnu.org/software/texinfo/;
|
||||
description = "The GNU documentation system";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ vrthra oxij ];
|
||||
|
||||
longDescription = ''
|
||||
Texinfo is the official documentation format of the GNU project.
|
||||
It was invented by Richard Stallman and Bob Chassell many years
|
||||
ago, loosely based on Brian Reid's Scribe and other formatting
|
||||
languages of the time. It is used by many non-GNU projects as
|
||||
well.
|
||||
|
||||
Texinfo uses a single source file to produce output in a number
|
||||
of formats, both online and printed (dvi, html, info, pdf, xml,
|
||||
etc.). This means that instead of writing different documents
|
||||
for online information and another for a printed manual, you
|
||||
need write only one document. And when the work is revised, you
|
||||
need revise only that one document. The Texinfo system is
|
||||
well-integrated with GNU Emacs.
|
||||
'';
|
||||
branch = version;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,37 +1,33 @@
|
|||
{ stdenv, buildPackages
|
||||
, fetchurl, readline70 ? null, texinfo ? null, binutils ? null, bison, autoconf
|
||||
, fetchurl, binutils ? null, bison, autoconf
|
||||
, buildPlatform, hostPlatform
|
||||
, interactive ? false
|
||||
|
||||
# patch for cygwin requires readline support
|
||||
, interactive ? stdenv.isCygwin, readline70 ? null
|
||||
, withDocs ? false, texinfo ? null
|
||||
, self
|
||||
}:
|
||||
|
||||
with stdenv.lib;
|
||||
|
||||
assert interactive -> readline70 != null;
|
||||
assert withDocs -> texinfo != null;
|
||||
assert hostPlatform.isDarwin -> binutils != null;
|
||||
|
||||
let
|
||||
version = "4.4";
|
||||
realName = "bash-${version}";
|
||||
shortName = "bash44";
|
||||
sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
|
||||
|
||||
upstreamPatches =
|
||||
let
|
||||
patch = nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}";
|
||||
inherit sha256;
|
||||
};
|
||||
in
|
||||
import ./bash-4.4-patches.nix patch;
|
||||
|
||||
inherit (stdenv.lib) optional optionals optionalString;
|
||||
upstreamPatches = import ./bash-4.4-patches.nix (nr: sha256: fetchurl {
|
||||
url = "mirror://gnu/bash/bash-4.4-patches/bash44-${nr}";
|
||||
inherit sha256;
|
||||
});
|
||||
in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "${realName}-p${toString (builtins.length upstreamPatches)}";
|
||||
name = "bash-${optionalString interactive "interactive-"}${version}-p${toString (builtins.length upstreamPatches)}";
|
||||
version = "4.4";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/bash/${realName}.tar.gz";
|
||||
inherit sha256;
|
||||
url = "mirror://gnu/bash/bash-${version}.tar.gz";
|
||||
sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq";
|
||||
};
|
||||
|
||||
hardeningDisable = [ "format" ];
|
||||
|
|
@ -50,18 +46,19 @@ stdenv.mkDerivation rec {
|
|||
patchFlags = "-p0";
|
||||
|
||||
patches = upstreamPatches
|
||||
++ optional hostPlatform.isCygwin ./cygwin-bash-4.4.11-2.src.patch
|
||||
# https://lists.gnu.org/archive/html/bug-bash/2016-10/msg00006.html
|
||||
++ optional (hostPlatform.libc == "musl") (fetchurl {
|
||||
++ optional hostPlatform.isMusl (fetchurl {
|
||||
url = "https://lists.gnu.org/archive/html/bug-bash/2016-10/patchJxugOXrY2y.patch";
|
||||
sha256 = "1m4v9imidb1cc1h91f2na0b8y9kc5c5fgmpvy9apcyv2kbdcghg1";
|
||||
});
|
||||
|
||||
postPatch = optionalString hostPlatform.isCygwin "patch -p2 < ${./cygwin-bash-4.4.11-2.src.patch}";
|
||||
});
|
||||
|
||||
configureFlags = [
|
||||
(if interactive then "--with-installed-readline" else "--disable-readline")
|
||||
] ++ optionals (hostPlatform != buildPlatform) [
|
||||
"bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing bash_cv_getcwd_malloc=yes"
|
||||
"bash_cv_job_control_missing=nomissing"
|
||||
"bash_cv_sys_named_pipes=nomissing"
|
||||
"bash_cv_getcwd_malloc=yes"
|
||||
] ++ optionals hostPlatform.isCygwin [
|
||||
"--without-libintl-prefix --without-libiconv-prefix"
|
||||
"--with-installed-readline"
|
||||
|
|
@ -75,8 +72,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Note: Bison is needed because the patches above modify parse.y.
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
nativeBuildInputs = [bison]
|
||||
++ optional (texinfo != null) texinfo
|
||||
nativeBuildInputs = [ bison ]
|
||||
++ optional withDocs texinfo
|
||||
++ optional hostPlatform.isDarwin binutils
|
||||
++ optional (hostPlatform.libc == "musl") autoconf;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
--- origsrc/bash-4.4/bashline.c 2017-01-23 13:28:06.955247200 -0600
|
||||
+++ src/bash-4.4/bashline.c 2017-01-23 13:55:07.992877600 -0600
|
||||
--- bashline.c 2017-01-23 13:28:06.955247200 -0600
|
||||
+++ bashline.c 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -76,6 +76,16 @@
|
||||
# include "pcomplete.h"
|
||||
#endif
|
||||
|
|
@ -104,8 +104,8 @@
|
|||
r = file_isdir (fn);
|
||||
free (fn);
|
||||
|
||||
--- origsrc/bash-4.4/builtins/read.def 2017-01-23 13:28:07.017686500 -0600
|
||||
+++ src/bash-4.4/builtins/read.def 2017-01-23 13:55:07.992877600 -0600
|
||||
--- builtins/read.def 2017-01-23 13:28:07.017686500 -0600
|
||||
+++ builtins/read.def 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -85,7 +85,6 @@ $END
|
||||
|
||||
#ifdef __CYGWIN__
|
||||
|
|
@ -140,8 +140,8 @@
|
|||
if ((skip_ctlesc == 0 && c == CTLESC) || (skip_ctlnul == 0 && c == CTLNUL))
|
||||
{
|
||||
saw_escape++;
|
||||
--- origsrc/bash-4.4/builtins/set.def 2016-06-02 19:10:10.000000000 -0500
|
||||
+++ src/bash-4.4/builtins/set.def 2017-01-23 13:55:07.992877600 -0600
|
||||
--- builtins/set.def 2016-06-02 19:10:10.000000000 -0500
|
||||
+++ builtins/set.def 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -56,6 +56,13 @@ extern int dont_save_function_defs;
|
||||
#if defined (READLINE)
|
||||
extern int no_line_editing;
|
||||
|
|
@ -258,8 +258,8 @@
|
|||
free (vname);
|
||||
}
|
||||
}
|
||||
--- origsrc/bash-4.4/builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500
|
||||
+++ src/bash-4.4/builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600
|
||||
--- builtins/shopt.def 2016-05-06 14:00:02.000000000 -0500
|
||||
+++ builtins/shopt.def 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -92,6 +92,10 @@ extern int glob_asciirange;
|
||||
extern int lastpipe_opt;
|
||||
extern int inherit_errexit;
|
||||
|
|
@ -281,8 +281,8 @@
|
|||
#if defined (READLINE)
|
||||
{ "complete_fullquote", &complete_fullquote, (shopt_set_func_t *)NULL},
|
||||
{ "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
|
||||
--- origsrc/bash-4.4/config-top.h 2016-05-19 13:34:02.000000000 -0500
|
||||
+++ src/bash-4.4/config-top.h 2017-01-23 13:55:07.992877600 -0600
|
||||
--- config-top.h 2016-05-19 13:34:02.000000000 -0500
|
||||
+++ config-top.h 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -87,10 +87,10 @@
|
||||
#define DEFAULT_BASHRC "~/.bashrc"
|
||||
|
||||
|
|
@ -305,8 +305,8 @@
|
|||
|
||||
/* Define if you want the case-capitalizing operators (~[~]) and the
|
||||
`capcase' variable attribute (declare -c). */
|
||||
--- origsrc/bash-4.4/doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600
|
||||
+++ src/bash-4.4/doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600
|
||||
--- doc/Makefile.in 2015-12-06 18:55:56.000000000 -0600
|
||||
+++ doc/Makefile.in 2017-01-23 13:55:07.992877600 -0600
|
||||
@@ -189,7 +189,7 @@ bashref.html: $(BASHREF_FILES) $(HSUSER)
|
||||
$(MAKEINFO) --html --no-split -I$(TEXINPUTDIR) $(srcdir)/bashref.texi
|
||||
|
||||
|
|
@ -329,8 +329,8 @@
|
|||
-if test -f bash.info; then d=.; else d=$(srcdir); fi; \
|
||||
$(INSTALL_DATA) $$d/bash.info $(DESTDIR)$(infodir)/bash.info
|
||||
# run install-info if it is present to update the info directory
|
||||
--- origsrc/bash-4.4/doc/bash.1 2016-08-26 08:45:17.000000000 -0500
|
||||
+++ src/bash-4.4/doc/bash.1 2017-01-23 13:55:08.008447700 -0600
|
||||
--- doc/bash.1 2016-08-26 08:45:17.000000000 -0500
|
||||
+++ doc/bash.1 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -9607,6 +9607,10 @@ filenames.
|
||||
This variable is set by default, which is the default bash behavior in
|
||||
versions through 4.2.
|
||||
|
|
@ -342,8 +342,8 @@
|
|||
.B direxpand
|
||||
If set,
|
||||
.B bash
|
||||
--- origsrc/bash-4.4/doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500
|
||||
+++ src/bash-4.4/doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600
|
||||
--- doc/bashref.texi 2016-09-07 16:13:36.000000000 -0500
|
||||
+++ doc/bashref.texi 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -5123,6 +5123,10 @@ filenames.
|
||||
This variable is set by default, which is the default Bash behavior in
|
||||
versions through 4.2.
|
||||
|
|
@ -355,8 +355,8 @@
|
|||
@item direxpand
|
||||
If set, Bash
|
||||
replaces directory names with the results of word expansion when performing
|
||||
--- origsrc/bash-4.4/doc/builtins.1 2012-02-21 13:32:05.000000000 -0600
|
||||
+++ src/bash-4.4/doc/builtins.1 2017-01-23 13:55:08.008447700 -0600
|
||||
--- doc/builtins.1 2012-02-21 13:32:05.000000000 -0600
|
||||
+++ doc/builtins.1 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -19,6 +19,6 @@ shift, shopt, source, suspend, test, tim
|
||||
ulimit, umask, unalias, unset, wait \- bash built-in commands, see \fBbash\fR(1)
|
||||
.SH BASH BUILTIN COMMANDS
|
||||
|
|
@ -365,8 +365,8 @@
|
|||
+.so man1/bash.1
|
||||
.SH SEE ALSO
|
||||
bash(1), sh(1)
|
||||
--- origsrc/bash-4.4/general.c 2016-08-11 10:16:56.000000000 -0500
|
||||
+++ src/bash-4.4/general.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- general.c 2016-08-11 10:16:56.000000000 -0500
|
||||
+++ general.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -48,6 +48,10 @@
|
||||
|
||||
#include <tilde/tilde.h>
|
||||
|
|
@ -388,8 +388,8 @@
|
|||
result = savestring (pathbuf);
|
||||
}
|
||||
#else
|
||||
--- origsrc/bash-4.4/input.c 2015-09-24 18:49:23.000000000 -0500
|
||||
+++ src/bash-4.4/input.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- input.c 2015-09-24 18:49:23.000000000 -0500
|
||||
+++ input.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -44,6 +44,10 @@
|
||||
#include "quit.h"
|
||||
#include "trap.h"
|
||||
|
|
@ -421,8 +421,8 @@
|
|||
#if !defined (DJGPP)
|
||||
return (bufstream_getc (buffers[bash_input.location.buffered_fd]));
|
||||
#else
|
||||
--- origsrc/bash-4.4/lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500
|
||||
+++ src/bash-4.4/lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- lib/sh/pathphys.c 2013-05-28 14:33:58.000000000 -0500
|
||||
+++ lib/sh/pathphys.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -35,6 +35,7 @@
|
||||
#include <stdio.h>
|
||||
#include <chartypes.h>
|
||||
|
|
@ -453,8 +453,8 @@
|
|||
double_slash_path = DOUBLE_SLASH (workpath);
|
||||
qbase += double_slash_path;
|
||||
|
||||
--- origsrc/bash-4.4/lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500
|
||||
+++ src/bash-4.4/lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- lib/sh/tmpfile.c 2016-08-11 10:05:58.000000000 -0500
|
||||
+++ lib/sh/tmpfile.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -101,7 +101,7 @@ get_tmpdir (flags)
|
||||
if (tdir && (file_iswdir (tdir) == 0 || strlen (tdir) > PATH_MAX))
|
||||
tdir = 0;
|
||||
|
|
@ -464,8 +464,8 @@
|
|||
tdir = get_sys_tmpdir ();
|
||||
|
||||
#if defined (HAVE_PATHCONF) && defined (_PC_NAME_MAX)
|
||||
--- origsrc/bash-4.4/mksyntax.c 2012-07-29 18:48:38.000000000 -0500
|
||||
+++ src/bash-4.4/mksyntax.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- mksyntax.c 2012-07-29 18:48:38.000000000 -0500
|
||||
+++ mksyntax.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -29,13 +29,13 @@
|
||||
|
||||
#ifdef HAVE_UNISTD_H
|
||||
|
|
@ -483,8 +483,8 @@
|
|||
#ifndef errno
|
||||
extern int errno;
|
||||
#endif
|
||||
--- origsrc/bash-4.4/parse.y 2016-09-11 10:31:46.000000000 -0500
|
||||
+++ src/bash-4.4/parse.y 2017-01-23 13:55:08.008447700 -0600
|
||||
--- parse.y 2016-09-11 10:31:46.000000000 -0500
|
||||
+++ parse.y 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -1539,14 +1539,20 @@ yy_string_get ()
|
||||
string = bash_input.location.string;
|
||||
|
||||
|
|
@ -509,8 +509,8 @@
|
|||
}
|
||||
|
||||
static int
|
||||
--- origsrc/bash-4.4/subst.c 2017-01-23 13:28:06.955247200 -0600
|
||||
+++ src/bash-4.4/subst.c 2017-01-23 13:55:08.008447700 -0600
|
||||
--- subst.c 2017-01-23 13:28:06.955247200 -0600
|
||||
+++ subst.c 2017-01-23 13:55:08.008447700 -0600
|
||||
@@ -43,6 +43,7 @@
|
||||
#include "posixstat.h"
|
||||
#include "bashintl.h"
|
||||
|
|
@ -562,8 +562,8 @@
|
|||
old_pid = last_made_pid;
|
||||
#if defined (JOB_CONTROL)
|
||||
old_pipeline_pgrp = pipeline_pgrp;
|
||||
--- origsrc/bash-4.4/support/bashversion.c 2008-09-09 08:31:53.000000000 -0500
|
||||
+++ src/bash-4.4/support/bashversion.c 2017-01-23 13:55:08.024037200 -0600
|
||||
--- support/bashversion.c 2008-09-09 08:31:53.000000000 -0500
|
||||
+++ support/bashversion.c 2017-01-23 13:55:08.024037200 -0600
|
||||
@@ -26,6 +26,9 @@
|
||||
|
||||
#if defined (HAVE_UNISTD_H)
|
||||
|
|
@ -584,8 +584,8 @@
|
|||
extern char *dist_version;
|
||||
extern int patch_level;
|
||||
|
||||
--- origsrc/bash-4.4/support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500
|
||||
+++ src/bash-4.4/support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600
|
||||
--- support/mkversion.sh 2008-08-13 07:25:57.000000000 -0500
|
||||
+++ support/mkversion.sh 2017-01-23 13:55:08.024037200 -0600
|
||||
@@ -29,7 +29,7 @@ source_dir="."
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
|
|
@ -595,8 +595,8 @@
|
|||
-s) shift; rel_status=$1; shift ;;
|
||||
-p) shift; patch_level=$1; shift ;;
|
||||
-d) shift; dist_version=$1; shift ;;
|
||||
--- origsrc/bash-4.4/variables.c 2016-06-15 15:05:52.000000000 -0500
|
||||
+++ src/bash-4.4/variables.c 2017-01-23 13:55:08.024037200 -0600
|
||||
--- variables.c 2016-06-15 15:05:52.000000000 -0500
|
||||
+++ variables.c 2017-01-23 13:55:08.024037200 -0600
|
||||
@@ -5239,6 +5239,7 @@ sv_winsize (name)
|
||||
/* Update the value of HOME in the export environment so tilde expansion will
|
||||
work on cygwin. */
|
||||
|
|
|
|||
|
|
@ -344,6 +344,7 @@ in
|
|||
concatMap (p: [ (getBin p) (getLib p) ])
|
||||
[ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils
|
||||
gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
|
||||
texinfo
|
||||
]
|
||||
# Library dependencies
|
||||
++ map getLib (
|
||||
|
|
@ -363,7 +364,7 @@ in
|
|||
inherit (prevStage)
|
||||
gzip bzip2 xz bash coreutils diffutils findutils gawk
|
||||
gnumake gnused gnutar gnugrep gnupatch patchelf
|
||||
attr acl paxctl zlib pcre;
|
||||
attr acl paxctl zlib pcre texinfo;
|
||||
${localSystem.libc} = getLibc prevStage;
|
||||
} // lib.optionalAttrs (super.targetPlatform == localSystem) {
|
||||
# Need to get rid of these when cross-compiling.
|
||||
|
|
|
|||
|
|
@ -5849,15 +5849,13 @@ with pkgs;
|
|||
runtimeShell = "${runtimeShellPackage}/bin/bash";
|
||||
runtimeShellPackage = bash;
|
||||
|
||||
bash = lowPrio (callPackage ../shells/bash/4.4.nix {
|
||||
texinfo = null;
|
||||
interactive = stdenv.isCygwin; # patch for cygwin requires readline support
|
||||
});
|
||||
bash = lowPrio (callPackage ../shells/bash/4.4.nix { });
|
||||
|
||||
# WARNING: this attribute is used by nix-shell so it shouldn't be removed/renamed
|
||||
bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix {
|
||||
bashInteractive = callPackage ../shells/bash/4.4.nix {
|
||||
interactive = true;
|
||||
});
|
||||
withDocs = true;
|
||||
};
|
||||
|
||||
bash-completion = callPackage ../shells/bash/bash-completion { };
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue