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

Merge pull request #40710 from ElvishJerricco/overrideCabal-getHaskellBuildInputs

Browse Source 
Make getHaskellBuildInputs / shellFor work with overrideCabal (Fixes #40266)
This commit is contained in:
Peter Simons
2018-05-22 10:37:26 +02:00
committed by GitHub
parent 5093abc8f1 5523ec8f3c
commit 07a045922d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/haskell-modules/make-package-set.nix
+2 -2
View File
@@ -38,7 +38,7 @@ let
inherit (stdenv) buildPlatform hostPlatform;
inherit (stdenv.lib) fix' extends makeOverridable;
inherit (haskellLib) overrideCabal;
inherit (haskellLib) overrideCabal getHaskellBuildInputs;
mkDerivationImpl = pkgs.callPackage ./generic-builder.nix {
inherit stdenv;
@@ -238,7 +238,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // {
shellFor = { packages, withHoogle ? false, ... } @ args:
let
selected = packages self;
packageInputs = builtins.map (p: p.override { mkDerivation = haskellLib.extractBuildInputs p.compiler; }) selected;
packageInputs = builtins.map getHaskellBuildInputs selected;
haskellInputs =
builtins.filter
(input: pkgs.lib.all (p: input.outPath != p.outPath) selected)