Merge 'staging' into closure-size

This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:35:03 +02:00
parent 056b5a1a5f c55cfe0cb3
commit d1df28f8e5
89 changed files with 1475 additions and 397 deletions
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -17,7 +17,7 @@ composableDerivation.composableDerivation {} {
            /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
          };

-  buildInputs = [ (pcre.override { unicodeSupport = true; })
+  buildInputs = [ pcre
                   openssl readline libxml2 ]; # optional python perl php java ?

  cfg = {