From c8d43bb1bd9458f1590b3fbd78706d057bd0d07f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 26 Dec 2024 15:23:07 +0100 Subject: [PATCH] haskell.packages.ghc9101.ghc-lib-parser*: retain 9.10.* versions The ormolu version we're using for 9.10 HLS doesn't like the 9.12 versions. --- .../configuration-hackage2nix/main.yaml | 2 + .../haskell-modules/hackage-packages.nix | 43 +++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5a1858868a5c3..daa13590bf587 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -61,6 +61,8 @@ extra-packages: - ghc-lib == 9.8.* # 2024-05-19: preserve for GHC 9.8 - ghc-lib-parser == 9.2.* # 2022-02-17: preserve for GHC 8.10, 9.0 - ghc-lib-parser == 9.8.* # 2024-05-19: preserve for GHC 9.8 + - ghc-lib-parser == 9.10.* # 2024-12-26: preserve for ghc-syntax-highlighter == 0.0.12.0 + - ghc-lib-parser-ex == 9.10.* # 2024-12-26: preserve for 9.10 HLS - ghc-lib-parser-ex == 9.2.* # 2022-07-13: preserve for GHC 8.10, 9.0 - ghc-lib-parser-ex == 9.8.* # 2024-05-19: preserve for GHC 9.8 - happy == 1.19.12 # for ghcjs diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 82a213f37bd63..317429cb254ce 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -122909,6 +122909,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser_9_10_1_20241103" = callPackage + ({ mkDerivation, alex, array, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, happy, parsec + , pretty, process, time, transformers, unix + }: + mkDerivation { + pname = "ghc-lib-parser"; + version = "9.10.1.20241103"; + sha256 = "17q8h8xaa7rn384zq3x7br93mi9g6gwqzp01bh99929qk0mvrsil"; + revision = "2"; + editedCabalFile = "02w33rvb6vfx7am6w0ri4if4m3lk1zf60mw4ibazzqgl4rbkf7im"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base binary bytestring containers deepseq directory + exceptions filepath ghc-prim parsec pretty process time + transformers unix + ]; + libraryToolDepends = [ alex happy ]; + description = "The GHC API, decoupled from GHC versions"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser_9_12_1_20241218" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, exceptions, filepath, ghc-prim, happy @@ -122989,6 +123012,26 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "ghc-lib-parser-ex_9_10_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.10.0.0"; + sha256 = "1v4nq8nvg9bpdnqgpy8pkzb05h7f9f6m2a6bcqj3j2i9jzqv7sb6"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base bytestring containers directory extra filepath ghc-lib-parser + tasty tasty-hunit uniplate + ]; + description = "Programming with GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_12_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, optparse-applicative, tasty