From 6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 Jan 2023 19:08:51 +0000 Subject: [PATCH] pkgsi686Linux.haskellPackages.tasty: pull missing unbounded-delays package The package is needed by tasty on a subset of architectures. Quoting upstream `.cabal` file: if(!arch(x86_64) && !arch(aarch64)) build-depends: unbounded-delays >= 0.1 This fails the build on i686 (a wine depend via shellcheck): Setup: Encountered missing or private dependencies: unbounded-delays >=0.1 The change pulls unbounded-delays for mentioned targets. Co-authored-by: sternenseemann --- .../development/haskell-modules/configuration-nix.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index f3ca49b1871..ea2c592ca75 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 = ''