Merge remote-tracking branch 'upstream/master' into stdenv-updates

2013-01-20 16:53:21 +01:00
parent d1c548cdd7 e185691ced
commit 1886d1db6a
41 changed files with 537 additions and 127 deletions
@@ -1,7 +1,11 @@
 rec {
-  allPackages = import ./all-packages.nix;

-  pkgs = allPackages {};
+  # Ensure that we don't build packages marked as unfree.
+  allPackages = args: import ./all-packages.nix (args // {
+    config.allowUnfree = false;
+  });
+
+  pkgs = allPackages { };

  /* !!! Hack: poor man's memoisation function.  Necessary for prevent
     Nixpkgs from being evaluated again and again for every