From 4cb2af029ab2f48e8f1630dcf040194e5026f864 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Mon, 15 Apr 2024 08:03:19 +0000 Subject: [PATCH] Disable R on aarch64; disable hls on -js and -windows --- cross-js.nix | 3 ++- cross-windows.nix | 3 ++- dynamic.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cross-js.nix b/cross-js.nix index 4ee2fe8..21d1083 100644 --- 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 index 4787390..656c391 100644 --- 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 index 34ee598..bf0ebf1 100644 --- 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 ])) ;