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

..

bash

bash: Update to 4.2-p37

2012-08-10 14:39:30 -04:00

bash-completion

bash-completion: remove NixOS-specific patch

2012-10-16 18:26:02 +02:00

dash

* Added dash.

2010-06-01 17:05:29 +00:00

ipython

ipython: Update to 0.13.

2012-07-25 18:04:52 +02:00

rush

GNU Rush 1.7.

2010-08-19 16:55:51 +00:00

tcsh

tcsh: Bump

2012-07-27 19:27:25 -04:00

zsh

* "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless

2012-01-18 20:16:00 +00:00