diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 544fc45772c1..413edf9979e1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -28,10 +28,15 @@ default-package-overrides: - gi-gdkx11 < 4 # 2021-11-09: ghc-bignum is bundled starting with 9.0.1; only 1.0 builds with GHCs prior to 9.2.1 - ghc-bignum == 1.0 - - hie-bios == 0.13.1 + # 2024-05-18: Various overrides for hls compatibility + - lsp < 2.5 + - lsp-types < 2.2 + - lsp-test < 0.17.0.1 + - extensions < 0.1.0.2 # Incompatible with Cabal < 3.12, the newest extensions version is only needed on ghc 9.10 # 2024-05-10: need to match hlegder from stackage - hledger-ui < 1.33 + extra-packages: - Cabal-syntax == 3.6.* # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8 - Cabal == 3.2.* # Used for packages needing newer Cabal on ghc 8.6 and 8.8 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b90e57e52565..74d8d4d7475a 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -104028,6 +104028,36 @@ self: { }) {}; "extensions" = callPackage + ({ mkDerivation, base, bytestring, Cabal, colourista, containers + , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog + , optparse-applicative, parsec, text + }: + mkDerivation { + pname = "extensions"; + version = "0.1.0.1"; + sha256 = "1rf6jhmms6ll7mn9rh81amzb7nd4zjqcnxdzivw50dxcrcfmdiq2"; + revision = "1"; + editedCabalFile = "1ixf5bpxy840zdlg3gsl3whzii03fc5j16i591pakprsvprp04hk"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory filepath ghc-boot-th + parsec text + ]; + executableHaskellDepends = [ + base colourista containers directory filepath optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring containers ghc-boot-th hedgehog hspec + hspec-hedgehog text + ]; + description = "Parse Haskell Language Extensions"; + license = lib.licenses.mpl20; + mainProgram = "extensions"; + }) {}; + + "extensions_0_1_0_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, colourista, containers , directory, filepath, ghc-boot-th, hedgehog, hspec, hspec-hedgehog , optparse-applicative, parsec, text @@ -104054,6 +104084,7 @@ self: { ]; description = "Parse Haskell Language Extensions"; license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; mainProgram = "extensions"; }) {}; @@ -148823,40 +148854,6 @@ self: { }) {}; "hie-bios" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , co-log-core, conduit, conduit-extra, cryptohash-sha1, deepseq - , directory, exceptions, extra, file-embed, filepath, ghc - , optparse-applicative, prettyprinter, tasty - , tasty-expected-failure, tasty-hunit, template-haskell, temporary - , text, time, transformers, unix-compat, unordered-containers, yaml - }: - mkDerivation { - pname = "hie-bios"; - version = "0.13.1"; - sha256 = "1qzri41yk88x6nnizjanh0w9inbm2sq93g197il95kb74bcslf9l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring co-log-core conduit - conduit-extra cryptohash-sha1 deepseq directory exceptions extra - file-embed filepath ghc prettyprinter template-haskell temporary - text time transformers unix-compat unordered-containers yaml - ]; - executableHaskellDepends = [ - base co-log-core directory filepath optparse-applicative - prettyprinter - ]; - testHaskellDepends = [ - aeson base co-log-core directory extra filepath ghc prettyprinter - tasty tasty-expected-failure tasty-hunit temporary transformers - yaml - ]; - description = "Set up a GHC API session"; - license = lib.licenses.bsd3; - mainProgram = "hie-bios"; - }) {}; - - "hie-bios_0_14_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , co-log-core, conduit, conduit-extra, cryptohash-sha1, deepseq , directory, exceptions, extra, file-embed, filepath, ghc @@ -148887,7 +148884,6 @@ self: { ]; description = "Set up a GHC API session"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; mainProgram = "hie-bios"; }) {}; @@ -165045,7 +165041,6 @@ self: { testHaskellDepends = [ base ]; description = "A native HTTP2 client library"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; }) {}; "http2-client-exe" = callPackage @@ -170181,7 +170176,6 @@ self: { ]; description = "JSX-like but for Haskell"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; }) {}; "ihs" = callPackage @@ -195684,6 +195678,35 @@ self: { }) {}; "lsp" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , co-log-core, containers, data-default, directory, exceptions + , filepath, hashable, hspec, hspec-discover, lens, lens-aeson + , lsp-types, mtl, prettyprinter, random, row-types, sorted-list + , stm, text, text-rope, transformers, unliftio-core + , unordered-containers, uuid + }: + mkDerivation { + pname = "lsp"; + version = "2.4.0.0"; + sha256 = "1ggfw2wp9g9fpg9x3kj9zh6l6p2yiw4q0v1gzxjg0mcmvp4aad8w"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring co-log-core containers + data-default directory exceptions filepath hashable lens lens-aeson + lsp-types mtl prettyprinter random row-types sorted-list stm text + text-rope transformers unliftio-core unordered-containers uuid + ]; + testHaskellDepends = [ + base containers hspec row-types sorted-list text text-rope + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Haskell library for the Microsoft Language Server Protocol"; + license = lib.licenses.mit; + }) {}; + + "lsp_2_6_0_0" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , co-log-core, containers, data-default, directory, exceptions , extra, filepath, hashable, hspec, hspec-discover, lens @@ -195711,6 +195734,7 @@ self: { testToolDepends = [ hspec-discover ]; description = "Haskell library for the Microsoft Language Server Protocol"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "lsp-client" = callPackage @@ -195741,6 +195765,38 @@ self: { }) {}; "lsp-test" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, co-log-core, conduit, conduit-parse, containers + , data-default, Diff, directory, exceptions, extra, filepath, Glob + , hspec, lens, lens-aeson, lsp, lsp-types, mtl, parser-combinators + , process, row-types, some, text, time, transformers, unix + , unliftio + }: + mkDerivation { + pname = "lsp-test"; + version = "0.17.0.0"; + sha256 = "1jjzqp7dbvaxysfa765zlcmb8h973242fb7a6b17cab3bjc12laq"; + revision = "1"; + editedCabalFile = "07090b7n5a02s1npzmwn6yfk4jnxwi98j1hqflcihni48ylx3b4g"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring co-log-core + conduit conduit-parse containers data-default Diff directory + exceptions extra filepath Glob lens lens-aeson lsp lsp-types mtl + parser-combinators process row-types some text time transformers + unix + ]; + testHaskellDepends = [ + aeson base co-log-core containers data-default directory extra + filepath hspec lens lsp mtl parser-combinators process text + unliftio + ]; + testToolDepends = [ lsp ]; + benchmarkHaskellDepends = [ base extra lsp process ]; + description = "Functional test framework for LSP servers"; + license = lib.licenses.bsd3; + }) {}; + + "lsp-test_0_17_0_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, co-log-core, conduit, conduit-parse, containers , data-default, Diff, directory, exceptions, extra, filepath, Glob @@ -195766,6 +195822,7 @@ self: { benchmarkHaskellDepends = [ base extra lsp process ]; description = "Functional test framework for LSP servers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "lsp-types_2_0_2_0" = callPackage @@ -195806,6 +195863,42 @@ self: { }) {}; "lsp-types" = callPackage + ({ mkDerivation, aeson, base, binary, containers, data-default + , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath + , generic-arbitrary, hashable, hspec, hspec-discover + , indexed-traversable, indexed-traversable-instances, lens + , lens-aeson, mod, mtl, network-uri, prettyprinter, QuickCheck + , quickcheck-instances, regex, row-types, safe, some + , template-haskell, text + }: + mkDerivation { + pname = "lsp-types"; + version = "2.1.1.0"; + sha256 = "0gsr0v11xfav7dnq4d433y9ca0snmqaax4pp5sgmf33zl8qhi6s0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary containers data-default deepseq Diff dlist + exceptions file-embed filepath generic-arbitrary hashable + indexed-traversable indexed-traversable-instances lens lens-aeson + mod mtl network-uri prettyprinter QuickCheck quickcheck-instances + row-types safe some template-haskell text + ]; + executableHaskellDepends = [ + base containers directory filepath mtl prettyprinter regex text + ]; + testHaskellDepends = [ + aeson base filepath hspec lens network-uri QuickCheck + quickcheck-instances row-types text + ]; + testToolDepends = [ hspec-discover ]; + doHaddock = false; + description = "Haskell library for the Microsoft Language Server Protocol, data types"; + license = lib.licenses.mit; + mainProgram = "generator"; + }) {}; + + "lsp-types_2_2_0_0" = callPackage ({ mkDerivation, aeson, base, binary, containers, data-default , deepseq, Diff, directory, dlist, exceptions, file-embed, filepath , generic-arbitrary, hashable, hspec, hspec-discover @@ -195838,6 +195931,7 @@ self: { doHaddock = false; description = "Haskell library for the Microsoft Language Server Protocol, data types"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; mainProgram = "generator"; }) {};