Merge branch 'master' into stdenv-updates

Conflicts: pkgs/top-level/all-packages.nix
2013-11-01 08:31:54 +01:00
parent b60d44a00a b6519f08da
commit 609f8dc04b
272 changed files with 4690 additions and 2945 deletions
@@ -10,7 +10,7 @@ let
 in
 buildEnv {
  name = "haskell-env-${ghc.name}";
-  paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation (packages ++ [ghc]));
+  paths = stdenv.lib.filter (x: x ? ghc) (stdenv.lib.closePropagation packages) ++ [ghc];
  postBuild = ''
    . ${makeWrapper}/nix-support/setup-hook