diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix index a82a26f8153..62aa67efd77 100644 --- a/pkgs/development/haskell-modules/configuration-arm.nix +++ b/pkgs/development/haskell-modules/configuration-arm.nix @@ -99,21 +99,22 @@ self: super: { hls-class-plugin = dontCheck super.hls-class-plugin; hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin; - # Similar RTS issue in test suite: - # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. - hls-hlint-plugin = dontCheck super.hls-hlint-plugin; - hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; - hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; - hls-rename-plugin = dontCheck super.hls-rename-plugin; - hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; - - # https://github.com/ekmett/half/issues/35 half = dontCheck super.half; # We disable profiling on aarch64, so tests naturally fail ghc-prof = dontCheck super.ghc-prof; +} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && builtins.compareVersions super.ghc.version "9.2" < 0) { + # Some aarch64 issues have been fixed since 9.2 + + # Similar RTS issue in test suite: + # rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed. + # Fixed since 9.2 + hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; + hls-rename-plugin = dontCheck super.hls-rename-plugin; + hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin; } // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch32 { # AARCH32-SPECIFIC OVERRIDES