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 |
|
Eelco Dolstra
|
6f8fad2253
|
Remove executable bits from non-executable files
|
2015-01-27 18:54:38 +01:00 |
|
Eric Seidel
|
f3c6827373
|
rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc
|
2015-01-14 20:27:55 -08:00 |
|
John Wiegley
|
28b6fb61e6
|
Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
|
2014-12-26 11:06:21 -06:00 |
|
Mateusz Kowalczyk
|
7a45996233
|
Turn some license strings into lib.licenses values
|
2014-07-28 11:31:14 +02:00 |
|
Domen Kozar
|
11874b9e3b
|
add Planetary Annihilation: next-generation RTS that takes the genre to a planetary scale
|
2014-03-16 23:31:08 +01:00 |
|