Skip to content

Commit 9b59a8a

Browse files
authored
Add th-orphans to th-dlls test (#2245)
* Add th-orphans to th-dlls test * Disable broken test * Bump head.hackage * Disable broken test
1 parent c2070f0 commit 9b59a8a

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

test/cabal.project.local

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repository head.hackage.ghc.haskell.org
2424
f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
2525
26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
2626
7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
27-
--sha256: sha256-Z6cqRAlbV1WNbK4fKdcWHQcLA8CGpzfnTOd8QxcOy+c=
27+
--sha256: sha256-IAYzsKIkZOgcNFuRkmwziLdwgU8tEe6vnhx+bugTSTw=
2828

2929
repository ghcjs-overlay
3030
url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/56cd424e8529e7a1fc29c6126abdc66f09467306

test/th-dlls/default.nix

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ in recurseIntoAttrs {
2424
|| (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl)
2525
# Failed to lookup symbol: __aarch64_swp8_acq_rel
2626
|| (builtins.elem compiler-nix-name ["ghc947" "ghc948"] && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64)
27+
# We have been unable to get windows cross compilation of th-orphans to work for GHC 8.10 using the latest nixpkgs
28+
|| (compiler-nix-name == "ghc8107" && stdenv.hostPlatform.isWindows)
29+
# We need to update GHC HEAD to get a version of ghc-internal compatible
30+
# with th-lift from head.hackage.
31+
|| compiler-nix-name == "ghc91120240918"
2732
;
2833

2934
ifdInputs = {

test/th-dlls/th-dlls.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ library
1414
, text
1515
, double-conversion
1616
, unix-time
17+
, th-orphans
1718
exposed-modules: Lib
1819
hs-source-dirs: src
1920
default-language: Haskell2010

0 commit comments

Comments
 (0)