From e1283fbe8807e5bc74f6e4a373f29b349728737f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sun, 15 Mar 2026 19:43:51 +0100 Subject: [PATCH] futhark: build against lsp >= 2.8 as requested Build still fails due to https://github.com/diku-dk/futhark/issues/2397. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/development/haskell-modules/configuration-nix.nix | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c02f802d36f6..5b2a9a7c0548 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -190,6 +190,12 @@ with haskellLib; } ); + # First to upgrade to lsp >= 2.8 while HLS hasn't yet had a compatible release + futhark = super.futhark.override { + lsp = self.lsp_2_8_0_0; + lsp-types = self.lsp-types_2_4_0_0; + }; + ####################################### ### HASKELL-LANGUAGE-SERVER SECTION ### ####################################### diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index d49e0a9d5e15..9f78ca40c92e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1023,6 +1023,11 @@ builtins.intersectAttrs super { ]; }) super.lsp-test; + lsp_2_8_0_0 = doDistribute (super.lsp_2_8_0_0.override { + lsp-types = self.lsp-types_2_4_0_0; + }); + lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0; + # the test suite attempts to run the binaries built in this package # through $PATH but they aren't in $PATH dhall-lsp-server = dontCheck super.dhall-lsp-server;