From 3cbe2b5bc3da7ba3fe685c31ac80d36877c070b1 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Wed, 11 Nov 2020 15:48:19 +0100 Subject: [PATCH] haskell-language-server: Fix hydra config for deps --- pkgs/development/haskell-modules/configuration-common.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c4b10e436ac..d1e05f502aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1452,10 +1452,10 @@ self: super: { # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let # fourmolu can‘t compile with an older aeson - overrideAeson = name: value: value.overrideScope (self: super: { + localOverride = name: value: doDistribute (value.overrideScope (self: super: { aeson = dontCheck super.aeson_1_5_2_0; - }); - in pkgs.lib.mapAttrs overrideAeson { + })); + in pkgs.lib.mapAttrs localOverride { # tons of overrides for bleeding edge versions for ghcide and hls # overriding aeson on all of them to prevent double compilations # this shouldn‘t break anything because nearly all their reverse deps are @@ -1469,6 +1469,8 @@ self: super: { ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; hie-bios = dontCheck super.hie-bios_0_7_1; lsp-test = dontCheck super.lsp-test_0_11_0_7; + hls-plugin-api = super.hls-plugin-api; + implicit-hie-cradle = super.implicit-hie-cradle; # the hls brittany is objectively better, because there hasn‘t been a # brittany release in a while and this version works with 8.10. # And we need to build it anyways.