From ac9f8df68b55387a8e4fa4f2e70c598b6d6d3618 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 8 Feb 2021 16:46:21 +0100 Subject: [PATCH] haskellPackages.haskell-language-server: 0.8.0 -> 0.9.0 --- .../haskell-modules/configuration-common.nix | 12 +- .../configuration-hackage2nix.yaml | 8 +- .../haskell-modules/hackage-packages.nix | 234 ++++++------------ 3 files changed, 87 insertions(+), 167 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 904825e5d8d..3d00a3efcf8 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1410,10 +1410,14 @@ self: super: { # https://github.com/haskell/haskell-language-server/issues/611 haskell-language-server = dontCheck super.haskell-language-server; - # 2021-01-20 - # apply-refact 0.9.0.0 get's a build error with hls-hlint-plugin 0.8.0 - # https://github.com/haskell/haskell-language-server/issues/1240 - apply-refact = super.apply-refact_0_8_2_1; + # 2021-02-08: Jailbreaking because of + # https://github.com/haskell/haskell-language-server/issues/1329 + hls-tactics-plugin = doJailbreak super.hls-tactics-plugin; + + # 2021-02-08: Overrides because nightly is to old for hls 0.9.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_11_0_7); + haskell-lsp = doDistribute self.haskell-lsp_0_23_0_0; + 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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 62944c30372..506a04c2e6a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,10 +73,6 @@ 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 - - hls-plugin-api == 0.6.0.0 # Needed for hls 0.8.0 - - hls-eval-plugin == 0.1.0.0 # Needed for hls 0.8.0 - - hls-hlint-plugin == 0.1.0.0 # Needed for hls 0.8.0 - - ghcide == 0.7.0.0 # Needed for hls 0.8.0 # Stackage Nightly 2021-02-10 - abstract-deque ==0.3 @@ -2719,8 +2715,10 @@ extra-packages: - dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20 - dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - - apply-refact == 0.8.2.1 # Needed for hls 0.8.0 - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls + - haskell-lsp == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - haskell-lsp-types == 0.23.0.0 # required by hls-plugin-api 0.7.0.0, 2021-02-08 + - lsp-test == 0.11.0.7 # required by hls-plugin-api 0.7.0.0, 2021-02-08 package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 9f3d7656071..41b5271cdc5 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -31766,37 +31766,6 @@ self: { broken = true; }) {}; - "apply-refact_0_8_2_1" = callPackage - ({ mkDerivation, base, containers, directory, extra, filemanip - , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative - , process, refact, silently, syb, tasty, tasty-expected-failure - , tasty-golden, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.8.2.1"; - sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory extra filemanip ghc ghc-exactprint - process refact syb transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact syb transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint optparse-applicative process refact silently syb - tasty tasty-expected-failure tasty-golden transformers unix-compat - ]; - description = "Perform refactorings specified by the refact library"; - license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative @@ -101763,65 +101732,6 @@ self: { }) {}; "ghcide" = callPackage - ({ mkDerivation, aeson, array, async, base, base16-bytestring - , binary, bytestring, case-insensitive, containers, cryptohash-sha1 - , data-default, deepseq, directory, extra, filepath, fingertree - , fuzzy, ghc, ghc-boot, ghc-boot-th, ghc-check, ghc-paths - , ghc-typelits-knownnat, gitrev, Glob, haddock-library, hashable - , haskell-lsp, haskell-lsp-types, heapsize, hie-bios, hie-compat - , hls-plugin-api, 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, 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, yaml - }: - mkDerivation { - pname = "ghcide"; - version = "0.7.0.0"; - sha256 = "165dbwbcpl2r7jqsjk859c42yas8h877mx37d0jnx8vm47fdy484"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async base base16-bytestring binary bytestring - case-insensitive containers cryptohash-sha1 data-default deepseq - directory extra filepath fingertree fuzzy ghc ghc-boot ghc-boot-th - ghc-check 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 - rope-utf16-splay safe safe-exceptions shake sorted-list stm syb - text time transformers unix unordered-containers utf8-string - ]; - 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 - ]; - description = "The core of an IDE"; - license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; - maintainers = with lib.maintainers; [ maralorn ]; - broken = true; - }) {shake-bench = null;}; - - "ghcide_0_7_4_0" = callPackage ({ mkDerivation, aeson, array, async, base, base16-bytestring , binary, bytestring, bytestring-encoding, case-insensitive , containers, cryptohash-sha1, data-default, deepseq, Diff @@ -118404,6 +118314,36 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp_0_23_0_0" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, directory, filepath, hashable + , haskell-lsp-types, hslogger, hspec, hspec-discover, lens, mtl + , network-uri, QuickCheck, quickcheck-instances, rope-utf16-splay + , sorted-list, stm, temporary, text, time, unordered-containers + }: + mkDerivation { + pname = "haskell-lsp"; + version = "0.23.0.0"; + sha256 = "07vyfqqvgaxg06yrawiwfffv511jlamhh4p7i0hwx60xdgpg11xh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + directory filepath hashable haskell-lsp-types hslogger lens mtl + network-uri rope-utf16-splay sorted-list stm temporary text time + unordered-containers + ]; + testHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hashable hspec lens network-uri QuickCheck quickcheck-instances + rope-utf16-splay sorted-list stm text unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp_0_24_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, filepath, hashable @@ -118473,6 +118413,24 @@ self: { license = lib.licenses.mit; }) {}; + "haskell-lsp-types_0_23_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, data-default + , deepseq, filepath, hashable, lens, network-uri, scientific, text + , unordered-containers + }: + mkDerivation { + pname = "haskell-lsp-types"; + version = "0.23.0.0"; + sha256 = "0dz0980681khfn229aky3bsclj86xkril2y0ln3wr7g9v77ypbq7"; + libraryHaskellDepends = [ + aeson base binary bytestring data-default deepseq filepath hashable + lens network-uri scientific text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "haskell-lsp-types_0_24_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, data-default , deepseq, filepath, hashable, lens, network-uri, scientific, text @@ -129371,28 +129329,6 @@ self: { }) {}; "hls-eval-plugin" = callPackage - ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory - , extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide, hashable - , haskell-lsp, haskell-lsp-types, hls-plugin-api - , parser-combinators, pretty-simple, QuickCheck, safe-exceptions - , shake, temporary, text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-eval-plugin"; - version = "0.1.0.0"; - sha256 = "1rghn0p8qqh9vh0x1ib2w00vv74y8j9qj2ydhwc68viii03wpjan"; - libraryHaskellDepends = [ - aeson base containers deepseq Diff directory extra filepath ghc - ghc-boot-th ghc-paths ghcide hashable haskell-lsp haskell-lsp-types - hls-plugin-api parser-combinators pretty-simple QuickCheck - safe-exceptions shake temporary text time transformers - unordered-containers - ]; - description = "Eval plugin for Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-eval-plugin_0_2_0_0" = callPackage ({ mkDerivation, aeson, base, containers, deepseq, Diff, directory , dlist, extra, filepath, ghc, ghc-boot-th, ghc-paths, ghcide , hashable, haskell-lsp, haskell-lsp-types, hls-plugin-api, lens @@ -129413,7 +129349,6 @@ self: { ]; description = "Eval plugin for Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-exactprint-utils" = callPackage @@ -129467,29 +129402,6 @@ self: { }) {}; "hls-hlint-plugin" = callPackage - ({ mkDerivation, aeson, apply-refact, base, binary, bytestring - , containers, data-default, deepseq, Diff, directory, extra - , filepath, ghc, ghcide, hashable, haskell-lsp, hlint - , hls-plugin-api, hslogger, lens, regex-tdfa, shake, temporary - , text, transformers, unordered-containers - }: - mkDerivation { - pname = "hls-hlint-plugin"; - version = "0.1.0.0"; - sha256 = "1sjbdzdrl4r0ar75z5znrv5iyim2hmf52c6r5hgmyn7wmhzbpvnq"; - revision = "1"; - editedCabalFile = "1al6a1kzhymxrpq5mvz1nlyhfcnjsz3ygqkafa8llb6hzsff6m7s"; - libraryHaskellDepends = [ - aeson apply-refact base binary bytestring containers data-default - deepseq Diff directory extra filepath ghc ghcide hashable - haskell-lsp hlint hls-plugin-api hslogger lens regex-tdfa shake - temporary text transformers unordered-containers - ]; - description = "Hlint integration plugin with Haskell Language Server"; - license = lib.licenses.asl20; - }) {}; - - "hls-hlint-plugin_0_2_0_0" = callPackage ({ mkDerivation, aeson, apply-refact, base, binary, bytestring , containers, data-default, deepseq, Diff, directory, extra , filepath, ghc, ghc-exactprint, ghcide, hashable, haskell-lsp @@ -129508,30 +129420,9 @@ self: { ]; description = "Hlint integration plugin with Haskell Language Server"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "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.6.0.0"; - sha256 = "0dnd20mb0id0l2dz6j3ckfrjyfm3mjys0kf11z3a684i4bc0w1pi"; - revision = "2"; - editedCabalFile = "0726nm80c7xfg6bxac32bg8yjszw5b0fq27jsg0w7dg2rg4zy1ji"; - 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_0_7_0_0" = callPackage ({ mkDerivation, aeson, base, containers, data-default, Diff , hashable, haskell-lsp, hslogger, lens, process, regex-tdfa, shake , text, unix, unordered-containers @@ -129547,7 +129438,6 @@ self: { ]; description = "Haskell Language Server API for plugin communication"; license = lib.licenses.asl20; - hydraPlatforms = lib.platforms.none; }) {}; "hls-retrie-plugin" = callPackage @@ -166279,6 +166169,34 @@ self: { license = lib.licenses.bsd3; }) {}; + "lsp-test_0_11_0_7" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-parse, containers, data-default + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl + , parser-combinators, process, text, transformers, unix + , unordered-containers + }: + mkDerivation { + pname = "lsp-test"; + version = "0.11.0.7"; + sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-parse containers data-default Diff directory filepath Glob + haskell-lsp lens mtl parser-combinators process text transformers + unix unordered-containers + ]; + testHaskellDepends = [ + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers + ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "lsp-test_0_12_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default