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

..

bash

Merge remote-tracking branch 'origin/master' into staging.

2014-08-04 16:51:47 +02:00

bash-completion

bash-completion: update to version 2.1

2013-04-10 17:39:09 +02:00

dash

dash: enable Hydra builds on Linux

2013-12-21 00:05:38 +01:00

fish

fish: fix 'fish_config' by providing python ncurses module

2014-06-30 20:39:02 +02:00

ipython

ipython: update 1.1.0 -> 2.0.0

2014-04-13 21:55:27 +02:00

rush

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

tcsh

tcsh: Bump

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

zsh

allow zsh on mac

2014-07-17 15:38:19 -07:00