From 2075b3715b529bf8fb593235321556ac8084c73d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Fri, 15 Feb 2019 12:17:29 +0100 Subject: [PATCH] Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]" --- pkgs/development/haskell-modules/make-package-set.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index e33ac7c5f85..b4cd7fee311 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -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;