cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #209543 from trofi/tasty-fix-on-i686

Browse source 
pkgsi686Linux.haskellPackages.tasty: pull missing unbounded-delays pa…
This commit is contained in:
maralorn 2023-01-07 22:29:40 +01:00 committed by GitHub
commit 968cfdab4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -359,6 +359,17 @@ self: super: builtins.intersectAttrs super {
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"''; preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';
}) super.ghcide; }) 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: { tasty-discover = overrideCabal (drv: {
# Depends on itself for testing # Depends on itself for testing
preBuild = '' preBuild = ''