Commit Graph

73 Commits

Author SHA1 Message Date
Eelco Dolstra
2ed5c2bd6b Set some meta.platforms
Also fix meta.platform -> meta.platforms in a few places.
2015-03-20 20:04:42 +01:00
Eelco Dolstra
a628d6ee18 bash: Update to 4.3-p30 2015-01-26 23:42:36 +01:00
Eelco Dolstra
103f5658a4 bash: Update to 4.3 2014-11-03 14:19:53 +01:00
Eelco Dolstra
a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/libav/default.nix
	pkgs/shells/bash/bash-4.2-patches.nix
	pkgs/stdenv/generic/default.nix
2014-10-07 00:09:37 +02:00
Eelco Dolstra
635ca3094f bash: Update to 4.2p53 2014-10-06 20:20:04 +02:00
Peter Simons
88ef0cb750 bash: add patch set 51 to fix http://lcamtuf.blogspot.de/2014/10/bash-bug-how-we-finally-cracked.html 2014-10-01 23:02:56 +02:00
Shell Turner
21c12b4065 Updated bash to patch 50.
This fully mitigates Shellshock and related parsing vulnerabilities,
due to attackers never controlling environment variable names.
2014-09-29 13:44:38 +02:00
Eelco Dolstra
0a0ebd8c44 bash: Fix for CVE-2014-7169 2014-09-25 14:40:44 +02:00
Shell Turner
ad3591cd9d Update bash patchset to fix CVE-2014-6271 2014-09-24 17:09:12 +02:00
Peter Simons
2d326e5032 Merge remote-tracking branch 'origin/master' into staging.
Conflicts:
	pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
01449afa1b bash: Update to 4.2-p47 2014-06-24 13:53:59 +02:00
Eelco Dolstra
2145471304 bash: Update to 4.2-p45 2013-08-26 14:28:56 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
Eelco Dolstra
0214514f8b bash: Disable parallel building
Parallel building randomly fails because bash's Makefiles at some
point do a recursive make invocation to build a file "version.h":

  ../version.h: ../config.h ../Makefile Makefile
          -( cd ${BUILD_DIR} && ${MAKE} ${MFLAGS} version.h )

As a result, both the parent and the child can end up building
version.h at the same time.  This causes the build to fail with

  mv: cannot stat `newversion.h': No such file or directory

http://hydra.nixos.org/build/3853249
2013-01-23 16:32:57 +01:00
Eelco Dolstra
b4dd943f16 bash: Update to 4.2-p42 2013-01-17 12:39:48 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Eelco Dolstra
4065ae9174 bash: Update to 4.2-p39 2012-11-23 17:29:05 +01:00
Eelco Dolstra
fcdfc1c50c bash: Update to 4.2-p37 2012-08-10 14:39:30 -04:00
Eelco Dolstra
69e32e52e2 * Bash 4.2.24.
svn path=/nixpkgs/branches/stdenv-updates/; revision=33554
2012-04-03 11:48:31 +00:00
Eelco Dolstra
1dbbc4581b * Latest bash patches.
svn path=/nixpkgs/branches/stdenv-updates/; revision=30854
2011-12-12 17:10:28 +00:00
Peter Simons
07a5a121fb synchronize with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29524
2011-09-28 14:48:34 +00:00
Peter Simons
dc55be9e05 pkgs/shells/bash: updated "interactive" bash to version 4.2
The non-interactive variant, which is part of stdenv, remains unchanged.

svn path=/nixpkgs/trunk/; revision=29523
2011-09-28 14:37:03 +00:00
Peter Simons
6a1bde84dc pkgs/shells/bash/default.nix: don't install bash completion in non-interactive mode
This patch removes the kludge introduced in trunk to avoid a stdenv rebuild.

svn path=/nixpkgs/branches/stdenv-updates/; revision=29469
2011-09-24 08:06:47 +00:00
Peter Simons
0ad122f4e6 sync with trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29468
2011-09-24 08:04:47 +00:00
Peter Simons
3e09798bf4 pkgs/shells/bash/default.nix: revert my earlier revision 29244
Including the bash-completion package in bash itself sounded like a good idea
at the time, but it wasn't. After having actually integrated completion support
into NixOS, it has become obvious that this property isn't required at all.
Keeping bash-completion separate from bash works just fine. Anyone who wants
completion support can just install that package.

svn path=/nixpkgs/trunk/; revision=29467
2011-09-24 07:58:19 +00:00
Shea Levy
01df54f5cc Merge from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=29461
2011-09-23 16:58:45 +00:00
Peter Simons
9f20aa5df6 bash: install extensive completion library in the interactive version
Add the command-line completion library to the "interactive" version of
bash. That code is *not* active by default. To enable it, run

 | . ${bash}/etc/bash_completion

in your ~/.bashrc. If you prefer to build bashInteractive without that
feature, use the following override in ~/.nixpkgs/config.nix to disable it:

 | {
 |   packageOverrides = pkgs:
 |   {
 |     bashInteractive = pkgs.bashInteractive.override {
 |       bashCompletion = null;
 |     };
 |   };
 | }

svn path=/nixpkgs/trunk/; revision=29244
2011-09-13 17:50:03 +00:00
Ludovic Courtès
0f1ba30626 GNU Bash 4.2.
svn path=/nixpkgs/branches/stdenv-updates/; revision=26119
2011-02-25 15:28:29 +00:00
Lluís Batlle i Rossell
1b62c9c061 I made changes to achieve a working cross-built gcc wrapper. Now,
"gcc45.hostDrv" works in the host system, together with libc, binutils, dynamic
linker, ...


svn path=/nixpkgs/branches/stdenv-updates/; revision=24971
2010-12-04 21:45:37 +00:00
Lluís Batlle i Rossell
ab419e9f86 Adding support for job control in bash cross-building, because otherwise it does not get built.
svn path=/nixpkgs/branches/stdenv-updates/; revision=24890
2010-11-27 15:49:43 +00:00
Lluís Batlle i Rossell
d910fcbcee Making bash and kbd cross-build
svn path=/nixpkgs/branches/stdenv-updates/; revision=24851
2010-11-25 09:14:56 +00:00
Eelco Dolstra
6b4de5c25e * None of us is paying attention today ;-)
svn path=/nixpkgs/branches/stdenv-updates/; revision=19690
2010-01-26 20:13:23 +00:00
Ludovic Courtès
6dc132be1e bash: Fix URL.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19688
2010-01-26 19:41:04 +00:00
Eelco Dolstra
0d88060fb6 * Update to bash-4.1-p2 (since we're rebuilding everything anyway).
svn path=/nixpkgs/branches/stdenv-updates/; revision=19680
2010-01-26 16:34:50 +00:00
Rob Vermaas
e8601a4227 explicitly disable readline support for bash on darwin, hacky for now, to avoid massive rebuild
svn path=/nixpkgs/branches/stdenv-updates/; revision=19678
2010-01-26 16:04:53 +00:00
Ludovic Courtès
eea396e744 GNU Bash 4.1.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19223
2010-01-05 11:27:57 +00:00
Ludovic Courtès
2e9a37cce1 bash: Make `update-patch-set.sh' executable.
svn path=/nixpkgs/branches/stdenv-updates/; revision=19221
2010-01-05 11:27:50 +00:00
Lluís Batlle i Rossell
a5fee3325a Fixing some things on the gcc-cross-wrapper (libc was not properly added to the
linking path), and with this achieved bash being cross-compilable.
I fixed the few expressions involved in bash building, so they have well stated
native and non-native inputs.

I also tried to cross-build guile, and with this I found a problem in the
actual cross-gcc: it calls the binutils ld, instead of the ld wrapper. This
way, the programs/shared_libraries don't get the proper -rpath.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18497
2009-11-20 22:56:58 +00:00
Lluís Batlle i Rossell
4b27d28701 Porting changes from stdenv-updates into this branch.
This comes from:
svn diff  ^/nixpkgs/trunk/@18255 ^/nixpkgs/branches/stdenv-updates/ > diff
patch -p0 < diff
and then adding into svn all files new from the patch.

trunk@18255 comes from the last time I updated stdenv-updates from trunk.


svn path=/nixpkgs/stdenv-updates2/; revision=18272
2009-11-08 00:32:12 +00:00
Eelco Dolstra
9d1a6b6c67 * Doh.
svn path=/nixpkgs/branches/stdenv-updates/; revision=15019
2009-04-14 07:35:20 +00:00
Eelco Dolstra
e6cf1abcec * bash: updated to 4.0 patchlevel 17. Removed the dietlibc patch, we
don't need it anymore.

svn path=/nixpkgs/branches/stdenv-updates/; revision=15018
2009-04-13 18:38:45 +00:00
Eelco Dolstra
5e9b323363 * Fixed bashInteractive.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14703
2009-03-25 15:59:02 +00:00
Ludovic Courtès
73b66bedd9 Remove redundant Bash 4.0 expression.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14663
2009-03-23 17:33:37 +00:00
Eelco Dolstra
d8e436c742 * Sync with the trunk.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14634
2009-03-20 16:49:02 +00:00
Peter Simons
ae474690ea Added bash 4.0 (and readline 6.0, which is required by bash).
svn path=/nixpkgs/trunk/; revision=14573
2009-03-17 14:03:03 +00:00
Ludovic Courtès
a6f044663b GNU Bash 4.0.
svn path=/nixpkgs/branches/stdenv-updates/; revision=14210
2009-02-23 21:26:35 +00:00
Eelco Dolstra
a5b607ef4f * Bash 3.2.48.
svn path=/nixpkgs/branches/stdenv-updates/; revision=13876
2009-01-27 11:03:41 +00:00
Eelco Dolstra
c441868a7e * bash: use the global /etc/bashrc and /etc/bash_logout files.
Changed the built-in default $PATH to /no-such-path.  (This also
  applies to the "standard utilities path" used by "command -p", so
  that doesn't work anymore, but it didn't work anyway on NixOS and
  nobody uses it.)  Include the startup files for non-interactive
  login shells.  Use bashrc when started from ssh.

svn path=/nixpkgs/trunk/; revision=12365
2008-07-16 15:05:49 +00:00
Eelco Dolstra
dd91141a06 * bash needs texinfo if you want the manpages / info docs.
svn path=/nixpkgs/trunk/; revision=12363
2008-07-16 13:36:41 +00:00