Skip to content

Commit 6cac989

Browse files
committed
Configure all components unless build-type: Simple
This is an alternative to #2257 that is probably closer to the `cabal-install` behaviour. It also has the advantage of removing the special case for `cabal-doctest`.
1 parent 5071941 commit 6cac989

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

builder/comp-builder.nix

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,7 @@ let self =
2323
, preInstall ? component.preInstall , postInstall ? component.postInstall
2424
, preHaddock ? component.preHaddock , postHaddock ? component.postHaddock
2525
, shellHook ? ""
26-
, configureAllComponents ? component.configureAllComponents ||
27-
# When set, configure all the components in the package
28-
# (not just the one we are building).
29-
# Enable for tests in packages that use cabal-doctest.
30-
( haskellLib.isTest componentId &&
31-
lib.any (x: x.identifier.name or "" == "cabal-doctest") (package.setup-depends ++ setup.config.depends or [])
32-
)
26+
, configureAllComponents ? package.buildType != "Simple"
3327
, allComponent # Used when `configureAllComponents` is set to get a suitable configuration.
3428

3529
, build-tools ? component.build-tools

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
let
9191
callFlake = import flake-compat;
9292

93-
ifdLevel = 3;
93+
ifdLevel = 0;
9494
runningHydraEvalTest = false;
9595
compiler = "ghc928";
9696
config = import ./config.nix;

0 commit comments

Comments
 (0)