diff --git a/ci.nix b/ci.nix index cbef43e89..4a82a1e03 100644 --- a/ci.nix +++ b/ci.nix @@ -89,7 +89,7 @@ inherit (lib.systems.examples) ghcjs; } // lib.optionalAttrs (nixpkgsName == "unstable" && (__match ".*llvm" compiler-nix-name == null) - && ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928" "ghc966" "ghc967" "ghc96720250227"]) # Not sure why GHC 9.6.6 TH code now wants `log1pf` + && ((system == "x86_64-linux" && !builtins.elem compiler-nix-name ["ghc902" "ghc928"]) || (system == "x86_64-darwin" && builtins.elem compiler-nix-name []))) { # TODO add ghc versions when we have more darwin build capacity inherit (lib.systems.examples) mingwW64; } // lib.optionalAttrs (nixpkgsName == "unstable" diff --git a/flake.lock b/flake.lock index 8cf31216e..d53e94400 100644 --- a/flake.lock +++ b/flake.lock @@ -405,11 +405,11 @@ "iserv-proxy": { "flake": false, "locked": { - "lastModified": 1749443511, - "narHash": "sha256-asfdanBoIUcJ9XQWB3a/5wQGFG/6Uq6l2s9r8OuamkY=", + "lastModified": 1750543273, + "narHash": "sha256-WaswH0Y+Fmupvv8AkIlQBlUy/IdD3Inx9PDuE+5iRYY=", "owner": "stable-haskell", "repo": "iserv-proxy", - "rev": "e40eddb1ca1e3e906e018c7e6b0d1e51c930ec9d", + "rev": "a53c57c9a8d22a66a2f0c4c969e806da03f08c28", "type": "github" }, "original": { diff --git a/overlays/bootstrap.nix b/overlays/bootstrap.nix index 5fe966e4a..13ee8670e 100644 --- a/overlays/bootstrap.nix +++ b/overlays/bootstrap.nix @@ -230,8 +230,9 @@ in { # This one will lead to segv's on darwin, when calling `strlen` during lookupStrHashTable. `strlen` ends up being called with 0x0. # This patch will allow adding additional symbols to iserv, instead of having to patch them into GHC all the time. ++ final.lib.optionals ( - (final.stdenv.targetPlatform.isAndroid || final.stdenv.targetPlatform.isLinux) - && (final.stdenv.targetPlatform.isAarch64 || final.stdenv.targetPlatform.is32bit)) + final.stdenv.targetPlatform.isWindows || + ( (final.stdenv.targetPlatform.isAndroid || final.stdenv.targetPlatform.isLinux) + && (final.stdenv.targetPlatform.isAarch64 || final.stdenv.targetPlatform.is32bit))) (fromUntil "9.6.1" "9.11" ./patches/ghc/iserv-syms.patch) ++ onAndroid (until "9.0" ./patches/ghc/ghc-8.10.7-weak-symbols-2.patch) ++ onDarwin (onAarch64 (until "9.0" ./patches/ghc/ghc-8.10.7-rts-aarch64-darwin.patch)) diff --git a/test/cabal.project.local b/test/cabal.project.local index 5c36c9fe2..2eb294ac1 100644 --- a/test/cabal.project.local +++ b/test/cabal.project.local @@ -29,7 +29,7 @@ repository head.hackage.ghc.haskell.org f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d - --sha256: sha256-Zu+OsPXt+tUllxC2LVJ3jneYGUH5GvdemZZPnynWaN0= + --sha256: sha256-Fn+JdHvwpbhYz5ffZU6+2HFZHLMLgah564mMdyUHKL4= repository ghcjs-overlay url: https://raw.githubusercontent.com/input-output-hk/hackage-overlay-ghcjs/ffb32dce467b9a4d27be759fdd2740a6edd09d0b diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix index 33315dc01..50f838fd4 100644 --- a/test/th-dlls/default.nix +++ b/test/th-dlls/default.nix @@ -43,7 +43,9 @@ in recurseIntoAttrs { build-ei = packages-ei.th-dlls.components.library; just-template-haskell-ei = packages-ei.th-dlls.components.exes.just-template-haskell; } // optionalAttrs - (!(builtins.elem compiler-nix-name ["ghc984" "ghc9122" "ghc91320250523"] && stdenv.buildPlatform.isx86_64 && stdenv.hostPlatform.isAarch64)) { + (!(builtins.elem compiler-nix-name ["ghc984" "ghc9122" "ghc91320250523"] && stdenv.buildPlatform.isx86_64 && stdenv.hostPlatform.isAarch64 + # The dependency on `math-functions` somehow breaks GHC 9.6.7 musl profiled builds (only with the external interpreter though) + || (compiler-nix-name == "ghc967" && stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64))) { # On for aarch64 cross compile on GHC this test is fails sometimes for non profiled builds # (and always for the profiled builds). # This may be related to the memory allocation changes made in 9.8.4 that diff --git a/test/th-dlls/th-dlls.cabal b/test/th-dlls/th-dlls.cabal index a0c19dfad..192b39dfc 100644 --- a/test/th-dlls/th-dlls.cabal +++ b/test/th-dlls/th-dlls.cabal @@ -15,6 +15,9 @@ library , double-conversion , unix-time , th-orphans + , ghc-prim + , math-functions + , erf exposed-modules: Lib hs-source-dirs: src default-language: Haskell2010