Skip to content

Commit b1e1bbe

Browse files
committed
ci(nix): add ghc9103 to exclusions and disabled test lists
1 parent 19b4164 commit b1e1bbe

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

ci.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,11 @@
8787
static = p: p.pkgsStatic;
8888
} // lib.optionalAttrs (nixpkgsName == "unstable"
8989
&& (__match ".*llvm" compiler-nix-name == null)
90-
&& !builtins.elem compiler-nix-name ["ghc9102"]) {
90+
&& !builtins.elem compiler-nix-name ["ghc9102" "ghc9103"]) {
9191
inherit (lib.systems.examples) ghcjs;
9292
} // lib.optionalAttrs (nixpkgsName == "unstable"
9393
&& (__match ".*llvm" compiler-nix-name == null)
94-
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102"]) {
94+
&& !builtins.elem compiler-nix-name ["ghc967" "ghc984" "ghc9102" "ghc9103"]) {
9595
inherit (lib.systems.examples) wasi32;
9696
} // lib.optionalAttrs (nixpkgsName == "unstable"
9797
&& (__match ".*llvm" compiler-nix-name == null)

test/js-template-haskell/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ in recurseIntoAttrs {
2525

2626
meta.disabled = builtins.elem compiler-nix-name ["ghc91320241204"]
2727
# Not sure why this is failing with a seg fault
28-
|| (builtins.elem compiler-nix-name ["ghc9102" "ghc9102llvm"] && stdenv.hostPlatform.isAndroid && stdenv.hostPlatform.isAarch32)
28+
|| (builtins.elem compiler-nix-name ["ghc9102" "ghc9102llvm" "ghc9103" "ghc9103llvm"] && stdenv.hostPlatform.isAndroid && stdenv.hostPlatform.isAarch32)
2929
# unhandled ELF relocation(Rel) type 10
3030
|| (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32);
3131

test/th-dlls/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ in recurseIntoAttrs {
3434
# (#103:librdrand_la-randombytes_internal_random.o) for relocation 4 in section 1 of kind: 0
3535
|| (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isMusl && !stdenv.buildPlatform.isAarch64)
3636
# Not sure why this is failing with a seg fault
37-
|| (builtins.elem compiler-nix-name ["ghc9102" "ghc9102llvm"] && stdenv.hostPlatform.isAndroid && stdenv.hostPlatform.isAarch32)
37+
|| (builtins.elem compiler-nix-name ["ghc9102" "ghc9102llvm" "ghc9103" "ghc9103llvm"] && stdenv.hostPlatform.isAndroid && stdenv.hostPlatform.isAarch32)
3838
# unhandled ELF relocation(Rel) type 10
3939
|| (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_32)
4040

0 commit comments

Comments
 (0)