diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-07 19:08:51 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-07 20:37:48 +0000 |
| commit | 6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72 (patch) | |
| tree | e6dabc9bded30834f294dbe3459d17ab30917daf /pkgs/development/haskell-modules | |
| parent | f9bce7444555bf24caad325080b9c614ba8ce0e0 (diff) | |
| download | nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar.gz nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar.bz2 nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar.lz nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar.xz nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.tar.zst nixlib-6d724cfb0a2d5dbb5ef28bcac488d5e28b0c5b72.zip | |
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 <sternenseemann@systemli.org>
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 f3ca49b18719..ea2c592ca75d 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 = '' |