From 0f1709ad236ca23fb2d935a7564e0fa891a56259 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 13 Nov 2020 11:20:42 +0100 Subject: [PATCH] haskell-language-server: Fix build Fixing a bound problem in ghcide and bumping ghc-exactprint --- .../haskell-modules/configuration-common.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 20f5357f78a..0a7070a34e6 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1463,10 +1463,16 @@ self: super: { haskell-language-server = dontCheck super.haskell-language-server; fourmolu = dontCheck super.fourmolu; stylish-haskell = super.stylish-haskell_0_12_2_0; - ghcide = dontCheck super.ghcide; + ghcide = dontCheck (appendPatch super.ghcide (pkgs.fetchpatch { + # 2020-11-13: Bumping bounds via an already upstream merged change + # https://github.com/haskell/ghcide/pull/905 + url = https://github.com/haskell/ghcide/commit/9b8aaf9b06846571cc0b5d46680e686e4f9153a3.patch; + sha256 = "0j8980dmvwjcs72ahq2zc14hwkyd5ybgzyy1az3zq5flp383fai6"; + includes = [ "ghcide.cabal" ]; + })); refinery = super.refinery_0_3_0_0; data-tree-print = doJailbreak super.data-tree-print; - ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_2; + ghc-exactprint = dontCheck super.ghc-exactprint_0_6_3_3; 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;