diff options
| author | maralorn <mail@maralorn.de> | 2023-01-07 22:29:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-07 22:29:40 +0100 |
| commit | 968cfdab4ac99497c804d32df54e4ba7226a89e0 (patch) | |
| tree | d3e703a380ec6a9f6e76ddfb2695391502bf24bf /pkgs/development/haskell-modules | |
| parent | 747e2e43f566f2b452ff9cf96c9a6a2138ca96c3 (diff) | |
| parent | 6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72 (diff) | |
| download | nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar.gz nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar.bz2 nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar.lz nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar.xz nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.tar.zst nixlib-968cfdab4ac99497c804d32df54e4ba7226a89e0.zip | |
Merge pull request #209543 from trofi/tasty-fix-on-i686
pkgsi686Linux.haskellPackages.tasty: pull missing unbounded-delays pa…
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-nix.nix | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 3cc9cb81a604..a882824043b9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -359,6 +359,17 @@ self: super: builtins.intersectAttrs super { preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; }) super.ghcide; + # At least on 1.3.4 version on 32-bit architectures tasty requires + # unbounded-delays via .cabal file conditions. + tasty = overrideCabal (drv: { + libraryHaskellDepends = + (drv.libraryHaskellDepends or []) + ++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64 + || pkgs.stdenv.hostPlatform.isx86_64)) [ + self.unbounded-delays + ]; + }) super.tasty; + tasty-discover = overrideCabal (drv: { # Depends on itself for testing preBuild = '' |