Disable R on aarch64; disable hls on -js and -windows

input-output-hk · Apr 15, 2024 · 4cb2af0 · 4cb2af0
1 parent 8493953
commit 4cb2af0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cross-js.nix b/cross-js.nix
@@ -87,7 +87,8 @@ pkgs.mkShell ({
         stdenv.cc.cc.lib ]) ++ (with pkgs.buildPackages; [
     ])
     ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.9" >= 0) compiler-nix-name
+         # it appears we can't get HLS build with 9.8 yet.
+         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
       ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
     ++ pkgs.lib.optional (withHlint && (compiler-not-in (
          pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name

diff --git a/cross-windows.nix b/cross-windows.nix
@@ -174,7 +174,8 @@ pkgs.pkgsBuildBuild.mkShell ({
         windows.mingw_w64_pthreads
     ])
     ++ pkgs.lib.optional (withHLS && (compiler-not-in (
-         pkgs.lib.optional (builtins.compareVersions compiler.version "9.9" >= 0) compiler-nix-name
+         # it appears we can't get HLS build with 9.8 yet.
+         pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name
       ++ pkgs.lib.optional (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) "ghc902") "Haskell Language Server")) (tool "haskell-language-server")
     ++ pkgs.lib.optional (withHlint && (compiler-not-in (
          pkgs.lib.optional (builtins.compareVersions compiler.version "9.8" >= 0) compiler-nix-name

diff --git a/dynamic.nix b/dynamic.nix
@@ -110,7 +110,7 @@ pkgs.mkShell {
         ]
         ++ map pkgs.lib.getDev (with pkgs; [ libblst libsodium-vrf secp256k1 icu ]
             ++ pkgs.lib.optional (withIOGFull) [
-                R          # for plutus
+                (if pkgs.stdenv.hostPlatform.isAarch64 then null else R) # for plutus; R is broken on aarch64
                 postgresql # for db-sync
             ]))
     ;