haskell-language-server: 0.9.0 -> 1.0.0

Adapt overrides for newest hls version

pkgs/development/haskell-modules/configuration-common.nix

@@ -1413,18 +1413,21 @@ self: super: {
   # https://github.com/haskell/haskell-language-server/issues/611
   haskell-language-server = dontCheck super.haskell-language-server;
 
-  # 2021-02-11: Jailbreaking because of syntax error on bound revision
+  # 2021-03-09: Overrides because nightly is to old for hls 1.0.0
-  hls-explicit-imports-plugin = doJailbreak super.hls-explicit-imports-plugin;
+  lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0);
 
-  # 2021-02-08: Overrides because nightly is to old for hls 0.9.0
+  # 2021-03-09: Golden tests seem to be missing in hackage release:
-  lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7);
+  # https://github.com/haskell/haskell-language-server/issues/1536
-  haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0;
+  hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
-  haskell-lsp-types = doDistribute self.haskell-lsp-types_0_23_0_0;
 
   # 1. test requires internet
   # 2. dependency shake-bench hasn't been published yet so we also need unmarkBroken and doDistribute
   ghcide = doDistribute (unmarkBroken (dontCheck super.ghcide));
 
+  # 2020-03-09: Tests broken in hackage release, fixed on upstream
+  # https://github.com/wz1000/HieDb/issues/30
+  hiedb = dontCheck super.hiedb;
+
   data-tree-print = doJailbreak super.data-tree-print;
 
   # 2020-11-15: aeson 1.5.4.1 needs to new quickcheck-instances for testing

pkgs/development/haskell-modules/configuration-hackage2nix.yaml

@@ -73,14 +73,7 @@ default-package-overrides:
   # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
   # not yet available in Nixpkgs
   - gi-gdkx11 < 4
-  # Don't update yet to remain compatible with haskell-language-server-0.9.0.
+
-  - ghcide < 0.7.4
-  - hls-class-plugin < 1
-  - hls-explicit-imports-plugin < 0.1.0.1
-  - hls-haddock-comments-plugin < 1
-  - hls-plugin-api < 0.7.1.0
-  - hls-retrie-plugin < 0.1.1.1
-  - hls-tactics-plugin < 1
   # Stackage Nightly 2021-03-06
   - abstract-deque ==0.3
   - abstract-par ==0.3.3
@@ -6456,7 +6449,6 @@ broken-packages:
   - hid-examples
   - hidden-char
   - hie-core
-  - hiedb
   - hieraclus
   - hierarchical-clustering-diagrams
   - hierarchical-exceptions

pkgs/development/haskell-modules/hackage-packages.nix

@@ -102053,68 +102053,6 @@ self: {
      }) {};
 
   "ghcide" = callPackage
-    ({ mkDerivation, aeson, array, async, base, base16-bytestring
-     , binary, bytestring, case-insensitive, containers, cryptohash-sha1
-     , data-default, deepseq, directory, dlist, extra, filepath
-     , fingertree, fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check
-     , ghc-exactprint, ghc-paths, ghc-typelits-knownnat, gitrev, Glob
-     , haddock-library, hashable, haskell-lsp, haskell-lsp-types
-     , heapsize, hie-bios, hie-compat, hls-plugin-api, hp2pretty
-     , hslogger, implicit-hie-cradle, lens, lsp-test, mtl, network-uri
-     , opentelemetry, optparse-applicative, parallel, prettyprinter
-     , prettyprinter-ansi-terminal, process, QuickCheck
-     , quickcheck-instances, record-dot-preprocessor, record-hasfield
-     , regex-tdfa, retrie, rope-utf16-splay, safe, safe-exceptions
-     , shake, shake-bench, sorted-list, stm, syb, tasty
-     , tasty-expected-failure, tasty-hunit, tasty-quickcheck
-     , tasty-rerun, text, time, transformers, unix, unordered-containers
-     , utf8-string, vector, yaml
-     }:
-     mkDerivation {
-       pname = "ghcide";
-       version = "0.7.3.0";
-       sha256 = "0iak2bwkp0x66cl9axcxq00vmf4yn6y0h8ih4wq6mnavmplbyi3b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array async base base16-bytestring binary bytestring
-         case-insensitive containers cryptohash-sha1 data-default deepseq
-         directory dlist extra filepath fingertree fuzzy ghc ghc-boot
-         ghc-boot-th ghc-check ghc-exactprint ghc-paths Glob haddock-library
-         hashable haskell-lsp haskell-lsp-types heapsize hie-bios hie-compat
-         hls-plugin-api hslogger implicit-hie-cradle lens mtl network-uri
-         opentelemetry parallel prettyprinter prettyprinter-ansi-terminal
-         regex-tdfa retrie rope-utf16-splay safe safe-exceptions shake
-         sorted-list stm syb text time transformers unix
-         unordered-containers utf8-string vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory extra
-         filepath gitrev hashable haskell-lsp haskell-lsp-types heapsize
-         hie-bios hls-plugin-api lens lsp-test optparse-applicative process
-         safe-exceptions shake text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base binary bytestring containers data-default directory
-         extra filepath ghc ghc-typelits-knownnat haddock-library
-         haskell-lsp haskell-lsp-types hls-plugin-api lens lsp-test
-         network-uri optparse-applicative process QuickCheck
-         quickcheck-instances record-dot-preprocessor record-hasfield
-         rope-utf16-splay safe safe-exceptions shake tasty
-         tasty-expected-failure tasty-hunit tasty-quickcheck tasty-rerun
-         text
-       ];
-       benchmarkHaskellDepends = [
-         aeson base directory filepath shake shake-bench text yaml
-       ];
-       benchmarkToolDepends = [ hp2pretty ];
-       description = "The core of an IDE";
-       license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
-     }) {shake-bench = null;};
-
-  "ghcide_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, array, async, base, base16-bytestring
      , binary, bytestring, bytestring-encoding, case-insensitive
      , containers, cryptohash-sha1, data-default, deepseq, dependent-map
@@ -127562,8 +127500,6 @@ self: {
        ];
        description = "Generates a references DB from .hie files";
        license = lib.licenses.bsd3;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
      }) {};
 
   "hieraclus" = callPackage
@@ -129856,23 +129792,6 @@ self: {
      }) {};
 
   "hls-class-plugin" = callPackage
-    ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
-     , ghcide, haskell-lsp, hls-plugin-api, lens, shake, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-class-plugin";
-       version = "0.1.0.1";
-       sha256 = "198r8kly4fgm9xsngkzhljbq1j764asc0xba757zasmgndvri2r7";
-       libraryHaskellDepends = [
-         aeson base containers ghc ghc-exactprint ghcide haskell-lsp
-         hls-plugin-api lens shake text transformers unordered-containers
-       ];
-       description = "Class/instance management plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-class-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, containers, ghc, ghc-exactprint
      , ghcide, hls-plugin-api, lens, lsp, shake, text, transformers
      , unordered-containers
@@ -129887,7 +129806,6 @@ self: {
        ];
        description = "Class/instance management plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-eval-plugin" = callPackage
@@ -129931,25 +129849,6 @@ self: {
      }) {};
 
   "hls-explicit-imports-plugin" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
-     , haskell-lsp-types, hls-plugin-api, shake, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-explicit-imports-plugin";
-       version = "0.1.0.0";
-       sha256 = "0il51ndiw16h5kgclwzx8p1pwv6ph808406bh52nq1bjyadlwkk2";
-       revision = "1";
-       editedCabalFile = "1mmsgs0n0x0q8zdzc617pi24wadgjr7hxrwqw6ihv004ahzdmjms";
-       libraryHaskellDepends = [
-         aeson base containers deepseq ghc ghcide haskell-lsp-types
-         hls-plugin-api shake text unordered-containers
-       ];
-       description = "Explicit imports plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-explicit-imports-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, ghc, ghcide
      , hls-plugin-api, lsp, lsp-types, shake, text, unordered-containers
      }:
@@ -129963,26 +129862,9 @@ self: {
        ];
        description = "Explicit imports plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-haddock-comments-plugin" = callPackage
-    ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
-     , haskell-lsp-types, hls-plugin-api, text, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-haddock-comments-plugin";
-       version = "0.1.1.0";
-       sha256 = "1kqkdbwx34k109dk3bl57hk2mcqw1cjj7l5382qfwy5bky4zjihn";
-       libraryHaskellDepends = [
-         base containers ghc ghc-exactprint ghcide haskell-lsp-types
-         hls-plugin-api text unordered-containers
-       ];
-       description = "Haddock comments plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-haddock-comments-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, base, containers, ghc, ghc-exactprint, ghcide
      , hls-plugin-api, lsp-types, text, unordered-containers
      }:
@@ -129996,7 +129878,6 @@ self: {
        ];
        description = "Haddock comments plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-hlint-plugin" = callPackage
@@ -130021,24 +129902,6 @@ self: {
      }) {};
 
   "hls-plugin-api" = callPackage
-    ({ mkDerivation, aeson, base, containers, data-default, Diff
-     , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake
-     , text, unix, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-plugin-api";
-       version = "0.7.0.0";
-       sha256 = "1cpl65ay55k3lvwsvqzwbg0c6lkzmiki2qvk6lj2dn6rcry9gk55";
-       libraryHaskellDepends = [
-         aeson base containers data-default Diff hashable haskell-lsp
-         hslogger lens process regex-tdfa shake text unix
-         unordered-containers
-       ];
-       description = "Haskell Language Server API for plugin communication";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-plugin-api_1_0_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
@@ -130055,29 +129918,9 @@ self: {
        ];
        description = "Haskell Language Server API for plugin communication";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-retrie-plugin" = callPackage
-    ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
-     , ghc, ghcide, hashable, haskell-lsp, haskell-lsp-types
-     , hls-plugin-api, retrie, safe-exceptions, shake, text
-     , transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "hls-retrie-plugin";
-       version = "0.1.1.0";
-       sha256 = "0wlrqqx2230xxvc1bl5gyx3cavs74c74bl4v3ib4v48wffgswbbj";
-       libraryHaskellDepends = [
-         aeson base containers deepseq directory extra ghc ghcide hashable
-         haskell-lsp haskell-lsp-types hls-plugin-api retrie safe-exceptions
-         shake text transformers unordered-containers
-       ];
-       description = "Retrie integration plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-retrie-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, containers, deepseq, directory, extra
      , ghc, ghcide, hashable, hls-plugin-api, lsp, lsp-types, retrie
      , safe-exceptions, shake, text, transformers, unordered-containers
@@ -130093,7 +129936,6 @@ self: {
        ];
        description = "Retrie integration plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hls-splice-plugin" = callPackage
@@ -130115,34 +129957,6 @@ self: {
      }) {};
 
   "hls-tactics-plugin" = callPackage
-    ({ mkDerivation, aeson, base, checkers, containers, deepseq
-     , directory, extra, filepath, fingertree, generic-lens, ghc
-     , ghc-boot-th, ghc-exactprint, ghc-source-gen, ghcide, haskell-lsp
-     , hie-bios, hls-plugin-api, hspec, hspec-discover, lens, mtl
-     , QuickCheck, refinery, retrie, shake, syb, text, transformers
-     }:
-     mkDerivation {
-       pname = "hls-tactics-plugin";
-       version = "0.5.1.0";
-       sha256 = "150hbhdj0rxiyslqfvwzqiyyc0pdvkbfjizv33ldbq8gmwn6lf52";
-       revision = "1";
-       editedCabalFile = "03g175y8hg962w7npphw9laaq9j0xf6nw6p04jd4y6d20pnjn1dl";
-       libraryHaskellDepends = [
-         aeson base containers deepseq directory extra filepath fingertree
-         generic-lens ghc ghc-boot-th ghc-exactprint ghc-source-gen ghcide
-         haskell-lsp hls-plugin-api lens mtl refinery retrie shake syb text
-         transformers
-       ];
-       testHaskellDepends = [
-         base checkers containers ghc hie-bios hls-plugin-api hspec mtl
-         QuickCheck
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Tactics plugin for Haskell Language Server";
-       license = lib.licenses.asl20;
-     }) {};
-
-  "hls-tactics-plugin_1_0_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, checkers, containers
      , data-default, deepseq, directory, extra, filepath, fingertree
      , generic-lens, ghc, ghc-boot-th, ghc-exactprint, ghc-source-gen
@@ -130177,7 +129991,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Wingman plugin for Haskell Language Server";
        license = lib.licenses.asl20;
-       hydraPlatforms = lib.platforms.none;
      }) {};
 
   "hlwm" = callPackage