haskell.packages.ghcjs: misc fixes
Various fixes I needed to build a project that depends on lens.
This commit is contained in:
parent
79cb171fd5
commit
a6f307ada4
|
@ -1619,6 +1619,7 @@ self: super: {
|
||||||
# Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x.
|
# 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.
|
# So let's not go there and just disable the tests altogether.
|
||||||
hspec-core = dontCheck super.hspec-core;
|
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
|
# tests seem to require a different version of hspec-core
|
||||||
hspec-contrib = dontCheck super.hspec-contrib;
|
hspec-contrib = dontCheck super.hspec-contrib;
|
||||||
|
|
|
@ -27,7 +27,7 @@ self: super:
|
||||||
# GHCJS does not ship with the same core packages as GHC.
|
# GHCJS does not ship with the same core packages as GHC.
|
||||||
# https://github.com/ghcjs/ghcjs/issues/676
|
# https://github.com/ghcjs/ghcjs/issues/676
|
||||||
stm = doJailbreak self.stm_2_5_1_0;
|
stm = doJailbreak self.stm_2_5_1_0;
|
||||||
exceptions = dontCheck self.exceptions_0_10_5;
|
exceptions = dontCheck self.exceptions_0_10_7;
|
||||||
|
|
||||||
## OTHER PACKAGES
|
## OTHER PACKAGES
|
||||||
|
|
||||||
|
@ -108,4 +108,26 @@ self: super:
|
||||||
|
|
||||||
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
|
# Need hedgehog for tests, which fails to compile due to dep on concurrent-output
|
||||||
zenc = dontCheck super.zenc;
|
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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -514,7 +514,8 @@ self: super: builtins.intersectAttrs super {
|
||||||
libraryHaskellDepends =
|
libraryHaskellDepends =
|
||||||
(drv.libraryHaskellDepends or [])
|
(drv.libraryHaskellDepends or [])
|
||||||
++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64
|
++ lib.optionals (!(pkgs.stdenv.hostPlatform.isAarch64
|
||||||
|| pkgs.stdenv.hostPlatform.isx86_64)) [
|
|| pkgs.stdenv.hostPlatform.isx86_64)
|
||||||
|
|| (self.ghc.isGhcjs or false)) [
|
||||||
self.unbounded-delays
|
self.unbounded-delays
|
||||||
];
|
];
|
||||||
}) super.tasty;
|
}) super.tasty;
|
||||||
|
|
Loading…
Reference in a new issue