Commit Graph

136 Commits

Author SHA1 Message Date
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Burke Libbey
3c437a643f GNU apparently modified bash patch 042. 2015-12-03 08:58:30 +01:00
Vladimír Čunát
6d6f8282f4 bash: remove bashbug for non-interactive, refactor 2015-10-28 10:09:33 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
William A. Kennington III
461a9ee562 bash4.3: p39 -> p42 2015-08-31 10:25:12 -07:00
William A. Kennington III
883fadf6d1 bash: Remove stale 4.1 patches 2015-08-31 10:23:01 -07:00
Jude Taylor
9c153e2227 add binutils to bash build for size 2015-08-12 11:27:54 -07:00
Eelco Dolstra
e1f78bf677 More docs/manpages in separate outputs 2015-07-27 00:27:54 +02:00
Eelco Dolstra
7c3bf186a6 bash: Update to 4.3-p39 2015-06-22 14:40:29 +02:00
Rok Garbas
bd59bf9a74 cygwin: bash updated to 4.3 for cygwin platform 2015-05-29 10:18:06 +02:00
Marko Durkovic
67ac12795a cygwin: add cygwin compatible bash version. 2015-05-28 10:53:35 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02:00
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
Vladimír Čunát
fb59f27a43 WIP: getting good 2014-08-27 01:14:09 +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
Eelco Dolstra
90f1d76790 * Bash 3.2 patchlevel 39.
svn path=/nixpkgs/branches/stdenv-updates/; revision=11799
2008-05-09 14:55:03 +00:00
Eelco Dolstra
a18e6606c8 * Bash 3.2 updated to patch level 33.
svn path=/nixpkgs/branches/stdenv-updates/; revision=10512
2008-02-06 13:26:27 +00:00
Eelco Dolstra
8cd1b893cf * coreutils-6.10, findutils-4.2.32.
* Added some meta attributes.

svn path=/nixpkgs/branches/stdenv-updates/; revision=10511
2008-02-06 13:18:50 +00:00
Eelco Dolstra
d0fc2251b4 * Bash 3.2 patchlevel 25.
svn path=/nixpkgs/branches/stdenv-updates/; revision=9795
2007-11-26 13:59:46 +00:00
Eelco Dolstra
d384ef5673 * Replace bash with bash-interactive.
svn path=/nixpkgs/trunk/; revision=8761
2007-05-24 15:44:03 +00:00
Eelco Dolstra
5021babc20 svn path=/nixpkgs/trunk/; revision=8760 2007-05-24 15:43:00 +00:00
Eelco Dolstra
cf693caa08 * Another example of an inline hook.
svn path=/nixpkgs/trunk/; revision=6864
2006-10-26 22:30:27 +00:00
Eelco Dolstra
4f03dec496 * Patch for a critical bug in bash.
svn path=/nixpkgs/trunk/; revision=6848
2006-10-25 12:38:57 +00:00
Eelco Dolstra
4d3059721d * bash 2.0, findutils 4.2.28.
* Some Nix expression simplifications.  Sense and simplicity!

svn path=/nixpkgs/trunk/; revision=6836
2006-10-24 23:05:12 +00:00
Eelco Dolstra
6b03da43d9 * binutils on dietlibc.
* Pass -lcompat by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6770
2006-10-19 11:03:20 +00:00
Eelco Dolstra
ce22859f8a * Bash on dietlibc.
* Pass -D_BSD_SOURCE=1 by default in the dietlibc stdenv.

svn path=/nixpkgs/trunk/; revision=6768
2006-10-18 16:16:07 +00:00
Eelco Dolstra
1442e8ec22 * Copy a bunch of files to nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=6711
2006-10-12 13:50:54 +00:00
Eelco Dolstra
368c196a62 * More descriptions.
svn path=/nixpkgs/trunk/; revision=6709
2006-10-12 10:53:16 +00:00
Armijn Hemel
722a69f93f update bash to 3.1
svn path=/nixpkgs/trunk/; revision=4859
2006-02-19 13:27:56 +00:00
Eelco Dolstra
82e678362f * "." -> "source".
svn path=/nixpkgs/trunk/; revision=4335
2005-12-05 14:11:09 +00:00
Eelco Dolstra
454707da23 * catamaran.labs.cs.uu.nl -> nix.cs.uu.nl.
svn path=/nixpkgs/trunk/; revision=3660
2005-08-22 08:39:27 +00:00
Eelco Dolstra
e42507d182 * Move tarballs to catamaran so that we are no longer dependent on a
gazillion different servers.  Resurrected some 25 missing files.

svn path=/nixpkgs/trunk/; revision=2237
2005-02-15 14:44:19 +00:00
Eelco Dolstra
c443a170fb * Bash updated to 3.0.
svn path=/nixpkgs/trunk/; revision=1439
2004-09-18 17:08:16 +00:00
Eelco Dolstra
04c272508c * Fix brokenness due to automatic transformations.
svn path=/nixpkgs/trunk/; revision=878
2004-03-30 12:37:17 +00:00
Eelco Dolstra
12ae5363ea * Remove trivial builders.
* Make builders unexecutable by removing the hash-bang line and
  execute permission.
* Convert calls to `derivation' to `mkDerivation'.
* Remove `system' and `stdenv' attributes from calls to
  `mkDerivation'.  These transformations were all done automatically,
  so it is quite possible I broke stuff.
* Put the `mkDerivation' function in stdenv/generic.

svn path=/nixpkgs/trunk/; revision=874
2004-03-29 17:23:01 +00:00
Eelco Dolstra
5941f66f0e * The stdenv setup script now defines a generic builder that allows
builders for typical Autoconf-style to be much shorten, e.g.,

    . $stdenv/setup
    genericBuild

  The generic builder does lots of stuff automatically:

  - Unpacks source archives specified by $src or $srcs (it knows about
    gzip, bzip2, tar, zip, and unpacked source trees).
  - Determines the source tree.
  - Applies patches specified by $patches.
  - Fixes libtool not to search for libraries in /lib etc.
  - Runs `configure'.
  - Runs `make'.
  - Runs `make install'.
  - Strips debug information from static libraries.
  - Writes nested log information (in the format accepted by
    `log2xml').

  There are also lots of hooks and variables to customise the generic
  builder.  See `stdenv/generic/docs.txt'.

* Adapted the base packages (i.e., the ones used by stdenv) to use the
  generic builder.

* We now use `curl' instead of `wget' to download files in `fetchurl'.

* Neither `curl' nor `wget' are part of stdenv.  We shouldn't
  encourage people to download stuff in builders (impure!).

* Updated some packages.

* `buildinputs' is now `buildInputs' (but the old name also works).

* `findInputs' in the setup script now prevents inputs from being
  processed multiple times (which could happen, e.g., if an input was
  a propagated input of several other inputs; this caused the size
  variables like $PATH to blow up exponentially in the worst case).

* Patched GNU Make to write nested log information in the format
  accepted by `log2xml'.  Also, prior to writing the build command,
  Make now writes a line `building X' to indicate what is being
  built.  This is unfortunately often obscured by the gigantic tool
  invocations in many Makefiles.  The actual build commands are marked
  `unimportant' so that they don't clutter pages generated by
  `log2html'.


svn path=/nixpkgs/trunk/; revision=845
2004-03-19 16:53:04 +00:00
Eelco Dolstra
026ff9466a * Rename .fix -> .nix.
svn path=/nixpkgs/trunk/; revision=511
2003-11-18 12:12:56 +00:00
Eelco Dolstra
48c3faca51 * Renamed pkgs-ng to pkgs.
svn path=/nixpkgs/trunk/; revision=502
2003-11-14 09:59:13 +00:00