From cf5049dd01e8e8f39ec390a0d255ce6fe7872536 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 3 Jul 2025 13:40:50 +1200 Subject: [PATCH 1/2] Add ghc9122llvm to ci Fixes #2404 --- ci.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci.nix b/ci.nix index 4a82a1e03..bcb3ad653 100644 --- a/ci.nix +++ b/ci.nix @@ -75,8 +75,9 @@ ghc98 = true; ghc98llvm = false; ghc910 = true; - ghc910llvm = true; + ghc910llvm = false; ghc912 = true; + ghc912llvm = true; ghc913 = true; }))); crossSystems = nixpkgsName: nixpkgs: compiler-nix-name: From 742a370fefed4d2d2c87a67203fa1812a4408b77 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Thu, 3 Jul 2025 22:07:50 +1200 Subject: [PATCH 2/2] Disable failing test --- test/th-dlls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/th-dlls/default.nix b/test/th-dlls/default.nix index 50f838fd4..1a612b23b 100644 --- a/test/th-dlls/default.nix +++ b/test/th-dlls/default.nix @@ -43,7 +43,7 @@ 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" "ghc9122llvm" "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