summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-common.nix
diff options
context:
space:
mode:
authorsternenseemann <sternenseemann@systemli.org>2023-08-20 00:26:52 +0200
committersternenseemann <sternenseemann@systemli.org>2023-08-20 00:26:52 +0200
commitdba9d4e33a2dd73d052aee9f71f494b086d43647 (patch)
tree6d170efe58d4a637b7fbaf21e5c8df0947d4340d /pkgs/development/haskell-modules/configuration-common.nix
parentf6d36e44ca1ee957ce6f1c130c9c68f10bf00f5d (diff)
downloadnixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar.gz
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar.bz2
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar.lz
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar.xz
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.tar.zst
nixpkgs-dba9d4e33a2dd73d052aee9f71f494b086d43647.zip
haskellPackages.lsp_2_1_0_0: allow building individually
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix10
1 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c0096b0b6aa..d4ad7e64fd2 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -2529,9 +2529,13 @@ self: super: {
   lucid-htmx = doJailbreak super.lucid-htmx;
 
   # Needs lsp >= 2.1
-  futhark = super.futhark.overrideScope (fself: _: {
-    lsp = fself.lsp_2_1_0_0;
-    lsp-types = fself.lsp-types_2_0_1_1;
+  futhark = super.futhark.override {
+    lsp = self.lsp_2_1_0_0;
+  };
+
+  # Provide matching lsp-types version
+  lsp_2_1_0_0 = doDistribute (super.lsp_2_1_0_0.override {
+    lsp-types = self.lsp-types_2_0_1_1;
   });
 
   # Too strict bounds on hspec