colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,356 Commits 126 Branches 0 Tags 3.1 GiB
5e1bfa8053
Commit Graph

113 Commits

Author SHA1 Message Date
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Peter Simons
07fb82aef3 bash-completion: update to current git HEAD at 2.0-95-gd08b9f2 
The 2.0 release is 7+ months old, and there has been lots of activity since.
 2013-01-30 12:25:11 +01: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
Peter Simons
f67d5a9a39 Merge branch 'master' into stdenv-updates. 
Conflicts have been resolved in:

        pkgs/tools/misc/file/default.nix
        pkgs/top-level/all-packages.nix
        pkgs/top-level/python-packages.nix
 2012-11-21 16:20:36 +01:00
Peter Simons
31b7510e22 bash-completion: remove NixOS-specific patch 
The new bash-completion support in NixOS doesn't require this patch anymore.
Besides, the patch was insufficient for most purposes anyway: Bash completion
modules are spread out over all user profiles listed in $NIX_PROFILES (plus the
current-system profile), so getting full support for all installed modules
requires support for more than one "bash_completion.d" directory anyway.
 2012-10-16 18:26:02 +02:00
Peter Simons
d5677fe6c7 stdenv-updates: merge updates from 'master' branch 2012-09-11 16:48:41 +02:00
Peter Simons
970a326ebb bash-completion: automatically source any completion files that the user might have installed in ~/.nix-profile/etc/bash_completion.d 2012-08-20 16:36:20 +02:00
Peter Simons
a886d4f2ab bash-completion: update to version 2.0 
Please note that this update changes the directory structure quite a bit. In
particular, the file "/etc/bash_completion" no longer exists, which means that
shell code which relies on that path must be updated. I'll commit appropriate
changes for NixOS in a moment.
 2012-08-20 10:34:56 +02:00
Eelco Dolstra
fcdfc1c50c bash: Update to 4.2-p37 2012-08-10 14:39:30 -04:00
Shea Levy
f11631c8c4 tcsh: Bump 2012-07-27 19:27:25 -04:00
aszlig
003ea37724 ipython: Update to 0.13. 2012-07-25 18:04:52 +02: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
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
 2012-01-18 20:16:00 +00:00
Yury G. Kudryashov
08761e83fc Merge trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31207
 2012-01-02 14:12:40 +00:00
Florian Friesdorf
89c3120b20 zsh profile load tweaking only on nixos 
svn path=/nixpkgs/trunk/; revision=31149
 2011-12-29 20:09:30 +00:00
Florian Friesdorf
0009c1f650 zshprofile to load /etc/profile while emulating bash 
svn path=/nixpkgs/trunk/; revision=31148
 2011-12-29 19:46:47 +00:00
Florian Friesdorf
ecba799e78 zsh meta 
svn path=/nixpkgs/trunk/; revision=31147
 2011-12-29 19:46:43 +00:00
Florian Friesdorf
c6ad751a8c zsh-4.3.15 
svn path=/nixpkgs/trunk/; revision=31146
 2011-12-29 19:46:37 +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
7edf0e8eaf synchronize with trunk 
svn path=/nixpkgs/branches/stdenv-updates/; revision=29870
 2011-10-18 08:47:36 +00:00
Cillian de Roiste
13e76321f0 Updating IPython (python shell) to 0.11 
svn path=/nixpkgs/trunk/; revision=29858
 2011-10-16 12:46:47 +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
Peter Simons
7bc8c122bd bash-completion: fixed hard-coded reference to /etc 
svn path=/nixpkgs/trunk/; revision=29226
 2011-09-12 17:31:11 +00:00
Shea Levy
4d70ba6cc9 Merge from trunk up through r28790 
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
 2011-08-24 19:16:43 +00:00
Peter Simons
db86b7f237 all-packages.nix: added package bash-completion 
svn path=/nixpkgs/trunk/; revision=27895
 2011-07-21 22:02:01 +00:00
Eelco Dolstra
f119c267de * getmail: don't use pythonFull. 
svn path=/nixpkgs/branches/modular-python/; revision=26566
 2011-03-28 13:13:15 +00:00
Eelco Dolstra
cef7e52b5a * ipython: simplify. 
svn path=/nixpkgs/branches/modular-python/; revision=26565
 2011-03-28 12:40:53 +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
ee04ffcb55 Updating from trunk. I resolved simple conflicts. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=25061
 2010-12-11 12:47:00 +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
Peter Simons
50a167ba7b pkgs/shells/ipython: added initial version of ipython 0.10.1 
Committing on behalf of Cillian de Róiste <cillian.deroiste@gmail.com>.

svn path=/nixpkgs/trunk/; revision=24928
 2010-11-29 18:04:56 +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
Ludovic Courtès
d9e30eb4a4 GNU Rush 1.7. 
svn path=/nixpkgs/trunk/; revision=23257
 2010-08-19 16:55:51 +00:00
Eelco Dolstra
d1ae973761 * Added dash. 
svn path=/nixpkgs/trunk/; revision=22088
 2010-06-01 17:05:29 +00:00
Ludovic Courtès
a174ff34b8 Add GNU SASL, GNU GSS-API, and GNU Rush. 
Contributed by Brian Gough <bjg@gnu.org>.

svn path=/nixpkgs/trunk/; revision=21315
 2010-04-26 08:59:25 +00:00
Eelco Dolstra
a617a7c239 * Sync with the trunk. 
svn path=/nixpkgs/branches/stdenv-updates/; revision=19786
 2010-02-03 14:23:43 +00:00
Nicolas Pierron
1664ec986a Update zsh. 
svn path=/nixpkgs/trunk/; revision=19740
 2010-01-31 12:13:38 +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