public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/development/compilers/ghc/with-packages.nix: add 'ignoreCollisions' parameter

Browse Source 
The ghcWithPackage expression now has an argument 'ignoreCollisions' that
allows users to disable the path collision check like so:

  (pkgs.haskellPackages.ghcWithPackages (pkgs: with pkgs; [ haskellPlatform ])).override { ignoreCollisions = true; };

See d64917ad17
for a long and detailed discussion of why these path collisions may occur.
This commit is contained in:
Peter Simons 2013-11-07 12:09:38 +01:00
parent 89c566fcfd
commit f92a5cbfc6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/compilers/ghc/with-packages.nix
View File

@ -1,4 +1,4 @@
{ stdenv, ghc, packages, buildEnv, makeWrapper }: { stdenv, ghc, packages, buildEnv, makeWrapper, ignoreCollisions ? false }:
assert packages != []; assert packages != [];
@ -12,6 +12,7 @@ in
buildEnv { buildEnv {
name = "haskell-env-${ghc.name}"; name = "haskell-env-${ghc.name}";
paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc]; paths = stdenv.lib.filter isHaskellPkg (stdenv.lib.closePropagation packages) ++ [ghc];
inherit ignoreCollisions;
postBuild = '' postBuild = ''
. ${makeWrapper}/nix-support/setup-hook . ${makeWrapper}/nix-support/setup-hook

3
pkgs/top-level/haskell-packages.nix
View File

@ -102,8 +102,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
# argument to this function. # argument to this function.
ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix { ghcWithPackages = pkgs : callPackage ../development/compilers/ghc/with-packages.nix {
ghc = ghc; # refers to ghcPlain ghc = ghc; # refers to ghcPlain
packages = pkgs self; packages = pkgs self;
ignoreCollisions = false;
}; };
ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix { ghcWithPackagesOld = pkgs : callPackage ../development/compilers/ghc/with-packages-old.nix {