Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
let
callFlake = import flake-compat;

ifdLevel = 3;
ifdLevel = 2;
runningHydraEvalTest = false;
compiler = "ghc928";
config = import ./config.nix;
Expand Down
10 changes: 9 additions & 1 deletion lib/load-cabal-plan.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ let
name = pkgs.lib.removePrefix "${prefix}:" n;
value = (if cabal2nixComponents == null then {} else cabal2nixComponents.${collectionName}.${name}) // {
buildable = true;
} // lookupDependencies hsPkgs c.depends c.exe-depends;
} // lookupDependencies hsPkgs (
c.depends
# If plan.json uses a single unit for this package (build-type: Custom),
# then it will leave the package itself out of `c.depends` for the
# components of the package.
# Haskell.nix builds the components separately so we need
# to add the `library` component as a dependency.
++ pkgs.lib.optional (p ? components && p.components ? lib) p.id
) c.exe-depends;
in { inherit name value; }
)) components));
in
Expand Down
Loading