From 2a78be482c67b85472f6288bbca2b73e9d7cd773 Mon Sep 17 00:00:00 2001 From: Hamish Mackenzie Date: Mon, 10 Jul 2023 17:46:53 +1200 Subject: [PATCH] Haskell Language Server 2.0.0.1 --- flake.lock | 8 ++++---- flake.nix | 2 +- test/haskell-language-server/cabal.nix | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 08101c349a..99f762d366 100644 --- a/flake.lock +++ b/flake.lock @@ -169,16 +169,16 @@ "hls-2.0": { "flake": false, "locked": { - "lastModified": 1684398654, - "narHash": "sha256-RW44up2BIyBBYN6tZur5f9kDDR3kr0Rd+TgPbLTfwB4=", + "lastModified": 1687698105, + "narHash": "sha256-OHXlgRzs/kuJH8q7Sxh507H+0Rb8b7VOiPAjcY9sM1k=", "owner": "haskell", "repo": "haskell-language-server", - "rev": "20c6d1e731cd9c0beef7338e2fc7a8126ba9b6fb", + "rev": "783905f211ac63edf982dd1889c671653327e441", "type": "github" }, "original": { "owner": "haskell", - "ref": "2.0.0.0", + "ref": "2.0.0.1", "repo": "haskell-language-server", "type": "github" } diff --git a/flake.nix b/flake.nix index 100f5ed393..581cabeef0 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ flake-compat = { url = "github:input-output-hk/flake-compat/hkm/gitlab-fix"; flake = false; }; flake-utils = { url = "github:hamishmack/flake-utils/hkm/nested-hydraJobs"; }; "hls-1.10" = { url = "github:haskell/haskell-language-server/1.10.0.0"; flake = false; }; - "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.0"; flake = false; }; + "hls-2.0" = { url = "github:haskell/haskell-language-server/2.0.0.1"; flake = false; }; hydra.url = "hydra"; hackage = { url = "github:input-output-hk/hackage.nix"; diff --git a/test/haskell-language-server/cabal.nix b/test/haskell-language-server/cabal.nix index 9ee5e4288b..9396d50910 100644 --- a/test/haskell-language-server/cabal.nix +++ b/test/haskell-language-server/cabal.nix @@ -3,7 +3,8 @@ let project = haskell-nix.cabalProject' { inherit compiler-nix-name evalPackages; name = "haskell-language-server"; - src = haskell-nix.sources."hls-1.10"; + src = haskell-nix.sources."hls-2.0"; + configureArgs = "--disable-benchmarks --disable-tests"; }; in recurseIntoAttrs { ifdInputs = { @@ -12,5 +13,5 @@ in recurseIntoAttrs { build = project.getComponent "haskell-language-server:exe:haskell-language-server"; # hls does not need to be cross compiled. - meta.disabled = stdenv.hostPlatform != stdenv.buildPlatform || __elem compiler-nix-name ["ghc961" "ghc962"]; + meta.disabled = stdenv.hostPlatform != stdenv.buildPlatform || __elem compiler-nix-name []; }