Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

haskell.packages.ghcjs: misc fixes #230673

Merged
merged 1 commit into from
May 9, 2023
Merged

haskell.packages.ghcjs: misc fixes #230673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions pkgs/development/haskell-modules/configuration-common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1604,6 +1604,7 @@ self: super: {
# Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x.
# So let's not go there and just disable the tests altogether.
hspec-core = dontCheck super.hspec-core;
hspec-core_2_7_10 = doDistribute (dontCheck super.hspec-core_2_7_10);

# tests seem to require a different version of hspec-core
hspec-contrib = dontCheck super.hspec-contrib;
Expand Down
24 changes: 23 additions & 1 deletion pkgs/development/haskell-modules/configuration-ghcjs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ self: super:
# GHCJS does not ship with the same core packages as GHC.
# https://github.com/ghcjs/ghcjs/issues/676
stm = doJailbreak self.stm_2_5_1_0;
exceptions = dontCheck self.exceptions_0_10_5;
exceptions = dontCheck self.exceptions_0_10_7;

## OTHER PACKAGES

Expand Down Expand Up @@ -108,4 +108,26 @@ self: super:

# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
zenc = dontCheck super.zenc;

hspec = self.hspec_2_7_10;
hspec-core = self.hspec-core_2_7_10;
hspec-meta = self.hspec-meta_2_7_8;
hspec-discover = self.hspec-discover_2_7_10;

# ReferenceError: h$primop_ShrinkSmallMutableArrayOp_Char is not defined
unordered-containers = dontCheck super.unordered-containers;

# Without this revert, test suites using tasty fail with:
# ReferenceError: h$getMonotonicNSec is not defined
# https://github.com/UnkindPartition/tasty/pull/345#issuecomment-1538216407
tasty = appendPatch (pkgs.fetchpatch {
name = "tasty-ghcjs.patch";
url = "https://github.com/UnkindPartition/tasty/commit/e692065642fd09b82acccea610ad8f49edd207df.patch";
revert = true;
relative = "core";
hash = "sha256-ryABU2ywkVOEPC/jWv8humT3HaRpCwMYEk+Ux3hhi/M=";
}) super.tasty;

# Tests take unacceptably long.
vector = dontCheck super.vector;
}
3 changes: 2 additions & 1 deletion pkgs/development/haskell-modules/configuration-nix.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,8 @@ self: super: builtins.intersectAttrs super {
libraryHaskellDepends =
(drv.libraryHaskellDepends or [])
++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64
|| pkgs.stdenv.hostPlatform.isx86_64)) [
|| pkgs.stdenv.hostPlatform.isx86_64)
|| (self.ghc.isGhcjs or false)) [
self.unbounded-delays
];
}) super.tasty;
Expand Down