Merge 'staging' into closure-size

- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
This commit is contained in:
Vladimír Čunát
2015-04-18 11:22:20 +02:00
6303 changed files with 375444 additions and 91358 deletions
+2
View File
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
is just a bonus.
'';
platforms = stdenv.lib.platforms.all;
license = stdenv.lib.licenses.gpl3Plus;
};
}