diff --git a/test/cabal.project.local b/test/cabal.project.local index e3bba2b48f..eeeccc821c 100644 --- a/test/cabal.project.local +++ b/test/cabal.project.local @@ -24,7 +24,7 @@ repository head.hackage.ghc.haskell.org f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d - --sha256: sha256-Z6cqRAlbV1WNbK4fKdcWHQcLA8CGpzfnTOd8QxcOy+c= + --sha256: sha256-IAYzsKIkZOgcNFuRkmwziLdwgU8tEe6vnhx+bugTSTw= repository ghcjs-overlay url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/56cd424e8529e7a1fc29c6126abdc66f09467306 diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix index db8816a362..5d7cf300e8 100644 --- a/test/th-dlls/default.nix +++ b/test/th-dlls/default.nix @@ -24,6 +24,11 @@ in recurseIntoAttrs { || (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl) # Failed to lookup symbol: __aarch64_swp8_acq_rel || (builtins.elem compiler-nix-name ["ghc947" "ghc948"] && haskellLib.isCrossHost && stdenv.hostPlatform.isAarch64) + # We have been unable to get windows cross compilation of th-orphans to work for GHC 8.10 using the latest nixpkgs + || (compiler-nix-name == "ghc8107" && stdenv.hostPlatform.isWindows) + # We need to update GHC HEAD to get a version of ghc-internal compatible + # with th-lift from head.hackage. + || compiler-nix-name == "ghc91120240918" ; ifdInputs = { diff --git a/test/th-dlls/th-dlls.cabal b/test/th-dlls/th-dlls.cabal index c0ab360a32..a0c19dfadd 100644 --- a/test/th-dlls/th-dlls.cabal +++ b/test/th-dlls/th-dlls.cabal @@ -14,6 +14,7 @@ library , text , double-conversion , unix-time + , th-orphans exposed-modules: Lib hs-source-dirs: src default-language: Haskell2010