From 4fc484c310adab46c304874691b243dfa706f198 Mon Sep 17 00:00:00 2001 From: Moritz Angermann Date: Sun, 14 Apr 2024 11:47:56 +0000 Subject: [PATCH] disable hls for 9.7+ We need to find a hls (and have it in haskell.nix) that builds with 9.8 :facepalm: --- dynamic.nix | 2 +- static.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dynamic.nix b/dynamic.nix index 6057aa9..e810ddc 100644 --- a/dynamic.nix +++ b/dynamic.nix @@ -95,7 +95,7 @@ pkgs.mkShell { ++ pkgs.lib.optional pkgs.stdenv.hostPlatform.isLinux systemd ) ++ pkgs.lib.optional (withHLS && (compiler-not-in ( - pkgs.lib.optional (builtins.compareVersions compiler.version "9.10" >= 0) compiler-nix-name + 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.10" >= 0) compiler-nix-name diff --git a/static.nix b/static.nix index e282744..aad4f31 100644 --- a/static.nix +++ b/static.nix @@ -142,7 +142,7 @@ pkgs.mkShell (rec { 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) "Haskell Language Server")) (tool "haskell-language-server") + pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name) "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) "HLint")) (tool "hlint") ++ pkgs.lib.optional withIOG (with pkgs; [ cddl cbor-diag ])