diff options
author | Silvan Mosberger <infinisil@icloud.com> | 2019-02-15 12:17:29 +0100 |
---|---|---|
committer | Silvan Mosberger <infinisil@icloud.com> | 2019-02-15 12:18:44 +0100 |
commit | 2075b3715b529bf8fb593235321556ac8084c73d (patch) | |
tree | 003c278dbe2ef5604443f202ea3f3b868dd0a3df /pkgs/development/haskell-modules/make-package-set.nix | |
parent | 1576c7474318dc7ef4f68258b5394aebc930d94b (diff) | |
download | nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar.gz nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar.bz2 nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar.lz nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar.xz nixlib-2075b3715b529bf8fb593235321556ac8084c73d.tar.zst nixlib-2075b3715b529bf8fb593235321556ac8084c73d.zip |
Revert "shellFor: Don't suck in src to compare to deps. [Fixes #51079]"
Diffstat (limited to 'pkgs/development/haskell-modules/make-package-set.nix')
-rw-r--r-- | pkgs/development/haskell-modules/make-package-set.nix | 8 |
1 files 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 e33ac7c5f852..b4cd7fee311b 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; |