diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5be231d21c1..2b6ba5073aa 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1430,6 +1430,9 @@ self: super: { ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4; }); + # 2021-03-09: Overrides because nightly is to old for hls 1.0.0 + lsp-test = doDistribute (dontCheck self.lsp-test_0_13_0_0); + # 2021-03-21 Test hangs # https://github.com/haskell/haskell-language-server/issues/1562 # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 839f3e420cd..3535162eabd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -73,8 +73,11 @@ 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 - - ghcide < 1.1 # To stay hls 1.0 compatible - - hls-retrie-plugin < 1.0.0.1 # To stay hls 1.0 compatible + # To stay hls 1.0 compatible + - ghcide < 1.1 + - hls-retrie-plugin < 1.0.0.1 + - lsp < 1.2 + - lsp-types < 1.2 # Stackage Nightly 2021-03-21 - abstract-deque ==0.3 @@ -2762,11 +2765,9 @@ extra-packages: - 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 - 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 - hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet. - optparse-applicative < 0.16 # needed for niv-0.2.19 + - lsp-test < 0.14 # needed for hls 1.0.0 package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5b11514ae64..22be3dab4dc 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -120038,36 +120038,6 @@ 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 @@ -120137,24 +120107,6 @@ 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 @@ -168648,6 +168600,36 @@ self: { }) {}; "lsp" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , containers, data-default, dependent-map, directory, filepath + , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl + , network-uri, QuickCheck, quickcheck-instances, random + , rope-utf16-splay, scientific, sorted-list, stm, text, time + , transformers, unliftio-core, unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "1.1.1.0"; + sha256 = "04ndz4v1mwga13qndmnaaj145y5zqw7zv64px7ak26qvd1m26h9r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring containers data-default + dependent-map directory filepath hashable hslogger lens lsp-types + mtl network-uri random scientific sorted-list stm text time + transformers unliftio-core unordered-containers uuid + ]; + 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; + }) {}; + + "lsp_1_2_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, dependent-map, directory, filepath , hashable, hslogger, hspec, hspec-discover, lens, lsp-types, mtl @@ -168675,6 +168657,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "lsp-test" = callPackage @@ -168704,27 +168687,27 @@ self: { license = lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_7" = callPackage + "lsp-test_0_13_0_0" = 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 + , Diff, directory, filepath, Glob, hspec, lens, lsp-types, mtl + , parser-combinators, process, some, text, time, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.7"; - sha256 = "01var9nm3kpw65jaz4rvky35ibrpfjyhfas9bi8avrw1vh2ybkcn"; + version = "0.13.0.0"; + sha256 = "1xyxmzcd6r56jj1k11lz1g6yld5q3k6cgb0bsf45px120dsf1dpy"; 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 + lens lsp-types mtl parser-combinators process some text time + transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default directory filepath haskell-lsp hspec lens + aeson base data-default directory filepath hspec lens lsp-types text unordered-containers ]; description = "Functional test framework for LSP servers"; @@ -168761,6 +168744,29 @@ self: { }) {}; "lsp-types" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , data-default, deepseq, dependent-sum, dependent-sum-template + , directory, filepath, hashable, hslogger, lens, network-uri + , rope-utf16-splay, scientific, some, template-haskell, temporary + , text, unordered-containers + }: + mkDerivation { + pname = "lsp-types"; + version = "1.1.0.0"; + sha256 = "19lkdqwh9a5rsx5nby37v54zhwyja306z0dyslsmdmwqw92qxx54"; + revision = "1"; + editedCabalFile = "0iifws4r1h9v1mbsrmbvssvm0gmvzm9yh9h85izly0s51869bbq4"; + libraryHaskellDepends = [ + aeson base binary bytestring containers data-default deepseq + dependent-sum dependent-sum-template directory filepath hashable + hslogger lens network-uri rope-utf16-splay scientific some + template-haskell temporary text unordered-containers + ]; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + }) {}; + + "lsp-types_1_2_0_0" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , data-default, deepseq, dependent-sum, dependent-sum-template , directory, filepath, hashable, hslogger, lens, network-uri @@ -168779,6 +168785,7 @@ self: { ]; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "lss" = callPackage