Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01:00
..
bash	bash: Update to 4.3-p30	2015-01-26 23:42:36 +01:00
bash-completion
dash	dash: update from 0.5.7 to 0.5.8	2014-09-30 10:29:50 +01:00
fish	update fish shell	2014-10-07 01:00:37 +04:00
ipython	nixpkgs: remove redundant attribute sip	2014-12-23 19:37:21 +01:00
mksh	MKSH (version R50d): New Package	2015-01-25 22:09:44 -02:00
rush	Fix many package descriptions	2014-08-24 22:31:37 +02:00
tcsh
zsh	zsh: update from 5.0.6 to 5.0.7	2014-10-09 09:43:33 +02:00