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
2015-01-26 12:12:14 +01:00
2015-01-31 19:34:57 +01:00
2015-01-31 19:34:57 +01:00
2015-01-31 19:34:57 +01:00
2015-01-26 20:59:52 -06:00
2014-12-09 15:09:06 +01:00
2015-01-21 11:21:45 +01:00
Description
No description provided
Readme 1.5 GiB
Languages
Nix 96.3%
Shell 1.8%
Python 0.7%
Perl 0.4%
C 0.3%
Other 0.1%