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.

1 files changed, 0 insertions, 6 deletions

diff --git a/pkgs/development/libraries/directfb/src-info-for-default.nix b/pkgs/development/libraries/directfb/src-info-for-default.nix
deleted file mode 100644
index f8c0f0d1f9b..00000000000
--- a/pkgs/development/libraries/directfb/src-info-for-default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  baseName = "directfb";
-  downloadPage = "http://directfb.org/index.php?path=Main%2FDownloads";
-  sourceRegexp = ''DirectFB-.*[.]tar[.].*'';
-  choiceCommand = ''tail -1'';
-}