From 4c71d57c99495ea405b29bf3fa7ed8f73d3d26cf Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Fri, 16 Apr 2021 17:04:45 +0200 Subject: [PATCH] haskellPackages.haskell-language-server: Fix more deps to stay compat with 1.0.0 --- .../configuration-hackage2nix.yaml | 2 + .../haskell-modules/hackage-packages.nix | 39 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index cc6df86a7a9..b6a24ac6727 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -82,6 +82,8 @@ default-package-overrides: - hls-retrie-plugin < 1.0.0.1 - lsp < 1.2 - lsp-types < 1.2 + - hls-plugin-api < 1.1.0.0 + - hls-explicit-imports-plugin < 1.0.0.1 # 2021-04-02: Stackage Nighlty has haskell-gi* < 0.25, # so we need to restrict these to compatible versions # Remove these as soon as haskell-gi{,-base} are 0.25.* diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e5132fd5fbd..ad2fa8e7dae 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -131977,6 +131977,24 @@ 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.0"; + sha256 = "14j89l8pkxrffllg06fj6215xqdswrbndyv5xa22f0g00acmwi6w"; + revision = "1"; + editedCabalFile = "0gch9wkz1h4g06xc48jhvs06jji9d0npa2zrj2gv1cbf6hjs0s92"; + 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_1" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers }: @@ -131990,6 +132008,7 @@ self: { ]; description = "Explicit imports plugin for Haskell Language Server"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-haddock-comments-plugin" = callPackage @@ -132030,6 +132049,25 @@ self: { }) {}; "hls-plugin-api" = callPackage + ({ mkDerivation, aeson, base, containers, data-default + , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger + , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix + , unordered-containers + }: + mkDerivation { + pname = "hls-plugin-api"; + version = "1.0.0.0"; + sha256 = "03pj0irgf9p84jn5kfd4cfyqk4xyfdf9pfrwqhb0c1ipnm4l7wal"; + libraryHaskellDepends = [ + aeson base containers data-default dependent-map dependent-sum Diff + dlist hashable hslogger lens lsp opentelemetry process regex-tdfa + shake text unix unordered-containers + ]; + description = "Haskell Language Server API for plugin communication"; + license = lib.licenses.asl20; + }) {}; + + "hls-plugin-api_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default , dependent-map, dependent-sum, Diff, dlist, hashable, hslogger , lens, lsp, opentelemetry, process, regex-tdfa, shake, text, unix @@ -132046,6 +132084,7 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage