Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]"
  • Loading branch information
infinisil committed Feb 15, 2019
1 parent 1576c74 commit 6e8c6f0
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions pkgs/development/haskell-modules/make-package-set.nix
Expand Up @@ -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;

Expand All @@ -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;

Expand Down

0 comments on commit 6e8c6f0

Please sign in to comment.