Skip to content

Commit 9bd0c38

Browse files
committed
Add default setup back into roots
1 parent 2de1bbe commit 9bd0c38

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

ci.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# 'supportedSystems' restricts the set of systems that we will evaluate for. Useful when you're evaluating
22
# on a machine with e.g. no way to build the Darwin IFDs you need!
3-
{ ifdLevel ? 3
3+
{ ifdLevel ? 1
44
, checkMaterialization ? false
55
, system ? builtins.currentSystem
66
, evalSystem ? builtins.currentSystem or "x86_64-linux"

overlays/haskell.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,6 +1120,10 @@ final: prev: {
11201120
}) // final.lib.optionalAttrs (ifdLevel > 1) {
11211121
# Things that require two levels of IFD to build (inputs should be in level 1)
11221122
nix-tools-unchecked = final.pkgsBuildBuild.haskell-nix.nix-tools-unchecked;
1123+
# This is the setup using the prefered Cabal library.
1124+
default-setup = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.defaultSetupFor "some-package";
1125+
# This is the one used when that one is not allowed.
1126+
setup-cabal-from-ghc = final.buildPackages.haskell-nix.compiler.${compiler-nix-name}.defaultSetup.useCabalFromGHC;
11231127
} // final.lib.optionalAttrs (ifdLevel > 1
11241128
&& final.haskell-nix.haskellLib.isCrossHost
11251129
# GHCJS builds its own template haskell runner.

0 commit comments

Comments
 (0)