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

Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]"

Browse Source
This commit is contained in:
Silvan Mosberger 2019-02-15 12:17:29 +01:00
parent 1576c74743
commit 2075b3715b
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -272,10 +272,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# bash$ nix-shell --run "cabal new-build all"
shellFor = { packages, withHoogle ? false, ... } @ args:
let
nullSrc = p: overrideCabal p (_: { src = null; });
# Make sure we *never* accidentally suck in src.
selected = map nullSrc (packages self);
selected = packages self;
packageInputs = map getBuildInputs selected;
@ -287,8 +284,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
# because cabal will end up ignoring that built version, assuming
# new-style commands.
haskellInputs = pkgs.lib.filter
# nullSrc in case a dep is one of the selected packages.
(input: pkgs.lib.all (p: (nullSrc input).outPath != p.outPath) selected)
(input: pkgs.lib.all (p: input.outPath != p.outPath) selected)
(pkgs.lib.concatMap (p: p.haskellBuildInputs) packageInputs);
systemInputs = pkgs.lib.concatMap (p: p.systemBuildInputs) packageInputs;