From dd9e4575ec2eb18e0cb005f36d52a8d5edea84df Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 30 May 2023 09:06:42 +0900 Subject: [PATCH] tests.haskell.incremental: change package used from turtle to temporary With a recent hackage update, turtle stopped compiling on ghc94. This commit changes the tests.haskell.incremental test to use the temporary package instead of turtle. --- pkgs/test/haskell/incremental/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/test/haskell/incremental/default.nix b/pkgs/test/haskell/incremental/default.nix index b94a85277db..4509939ba4f 100644 --- a/pkgs/test/haskell/incremental/default.nix +++ b/pkgs/test/haskell/incremental/default.nix @@ -9,26 +9,26 @@ let inherit (haskell.lib.compose) overrideCabal; # Incremental builds work with GHC >=9.4. - turtle = haskell.packages.ghc944.turtle; + temporary = haskell.packages.ghc944.temporary; - # This will do a full build of `turtle`, while writing the intermediate build products + # This will do a full build of `temporary`, while writing the intermediate build products # (compiled modules, etc.) to the `intermediates` output. - turtle-full-build-with-incremental-output = overrideCabal (drv: { + temporary-full-build-with-incremental-output = overrideCabal (drv: { doInstallIntermediates = true; enableSeparateIntermediatesOutput = true; - }) turtle; + }) temporary; - # This will do an incremental build of `turtle` by copying the previously + # This will do an incremental build of `temporary` by copying the previously # compiled modules and intermediate build products into the source tree # before running the build. # # GHC will then naturally pick up and reuse these products, making this build # complete much more quickly than the previous one. - turtle-incremental-build = overrideCabal (drv: { - previousIntermediates = turtle-full-build-with-incremental-output.intermediates; - }) turtle; + temporary-incremental-build = overrideCabal (drv: { + previousIntermediates = temporary-full-build-with-incremental-output.intermediates; + }) temporary; in - turtle-incremental-build.overrideAttrs (old: { + temporary-incremental-build.overrideAttrs (old: { meta = { maintainers = lib.teams.mercury.members; };