Skip to content
Merged
Changes from all 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
20 changes: 20 additions & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,26 @@ with haskellLib;
# 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5
lvar = doJailbreak super.lvar;

# Don't call setEnv in parallel in the test suite (which leads to flaky failures)
env-extra =
appendPatches
[
(pkgs.fetchpatch {
name = "env-extra-no-parallel-setenv.patch";
url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch";
sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4=";
excludes = [ "package.yaml" ];
})
]
(
overrideCabal (drv: {
prePatch = ''
${drv.prePatch or ""}
${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
'';
}) super.env-extra
);

# This used to be a core package provided by GHC, but then the compiler
# dropped it. We define the name here to make sure that old packages which
# depend on this library still evaluate (even though they won't compile
Expand Down