From b729cc4565687f51c67ba2de8d022f0daade48d8 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Tue, 11 May 2021 19:59:55 +0200 Subject: [PATCH] haskellPackages.haskell-language-server: Fix build --- .../configuration-hackage2nix/main.yaml | 6 ++++-- .../haskell-modules/hackage-packages.nix | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 2de430b228d..e1031bc7255 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -81,8 +81,10 @@ default-package-overrides: # e. g. https://github.com/diagrams/diagrams-core/issues/115 # We can keep this pin presumably until base 4.15 - monoid-extras < 0.6 - - ghcide == 1.2.* # 2021-05-11: Pin for hls 1.1.0 - - hls-plugin-api == 1.1.0.0 # 2021-05-11: Pin for hls 1.1.0 + # 2021-05-11: Pin for hls 1.1.0 + - ghcide == 1.2.* + - hls-plugin-api == 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.2 extra-packages: - base16-bytestring < 1 # required for cabal-install etc. diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6adb2d2624f..1bbfc17473d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -129784,6 +129784,22 @@ self: { }) {}; "hls-explicit-imports-plugin" = callPackage + ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide + , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers + }: + mkDerivation { + pname = "hls-explicit-imports-plugin"; + version = "1.0.0.1"; + sha256 = "1ygs667pkc3zn66yqz6ssrxifhrc906sddmcgjnkprk7zappk2nc"; + libraryHaskellDepends = [ + aeson base containers deepseq ghc ghcide hls-plugin-api lsp + lsp-types shake text unordered-containers + ]; + description = "Explicit imports plugin for Haskell Language Server"; + license = lib.licenses.asl20; + }) {}; + + "hls-explicit-imports-plugin_1_0_0_2" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-graph, hls-plugin-api, lsp, lsp-types, text , unordered-containers @@ -129798,6 +129814,7 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-graph" = callPackage