From e6483fb7e2d8df0feb6aa2d70d8c9e56254644b0 Mon Sep 17 00:00:00 2001 From: maralorn Date: Sat, 18 Nov 2023 00:31:27 +0100 Subject: [PATCH] haskell.packages.ghc90.hspec-megaparsec: Fix build Needed for HLS --- .../haskell-modules/configuration-ghc-9.0.x.nix | 2 ++ .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 17 +++++++++++++++++ 3 files changed, 20 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 453526274094..de1412f4c0ee 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -171,4 +171,6 @@ self: super: { # Requires GHC < 9.4 ghc-source-gen = doDistribute (unmarkBroken super.ghc-source-gen); + + hspec-megaparsec = super.hspec-megaparsec_2_2_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 8e43db7fd330..32178ebccdfd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -117,6 +117,7 @@ extra-packages: - hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 - hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6 + - hspec-megaparsec == 2.2.0 # 2023-11-18: Latest version compatible with ghc 9.0, needed for HLS - hspec-meta < 2.8 # 2022-12-07: Needed for elmPackages.elm / hspec-discover - hspec-golden == 0.1.* # 2022-04-07: Needed for elm-format - http2 < 3.3 # 2023-08-24: Needed for twain diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e33cdba4c6b3..4c547fb457b8 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -159093,6 +159093,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "hspec-megaparsec_2_2_0" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "2.2.0"; + sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hspec-megaparsec" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: mkDerivation {