diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3d9c2a46e8b3..e02fcdca8838 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1162,6 +1162,20 @@ with haskellLib; # https://github.com/ndmitchell/shake/issues/804 shake = dontCheck super.shake; + # https://github.com/martijnbastiaan/doctest-parallel/pull/99 + doctest-parallel = lib.pipe super.doctest-parallel [ + (appendPatch (fetchpatch { + name = "ghc-9.14-fixes"; + url = "https://github.com/martijnbastiaan/doctest-parallel/commit/f3a40202ef8d2d4927dae706bf89f11b2800202d.patch"; + sha256 = "sha256-mKF/hpMXWq5meiBHNbIKAz6c33DWE7zzHkS+Hgl5uX4"; + })) + (overrideCabal (drv: { + # Revision change is not present in PR target branch + editedCabalFile = null; + revision = null; + })) + ]; + # https://github.com/nushio3/doctest-prop/issues/1 doctest-prop = dontCheck super.doctest-prop; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index d5c3595591c1..37eec6f9f12a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -88,7 +88,7 @@ with haskellLib; }) super.cpphs; cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc. ghc-exactprint_1_12_0_0 = addBuildDepends [ - # somehow buildDepends was missing + # cabal2nix drops conditional block: impl (ghc >= 9.12) self.Diff self.extra self.ghc-paths diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix index e3ccdf381d5f..8b24d8acc949 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.14.x.nix @@ -74,6 +74,9 @@ with haskellLib; # Version upgrades # + ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0; + hedgehog = doDistribute self.hedgehog_1_7; + lifted-async = doDistribute self.lifted-async_0_11_0; parallel = doDistribute self.parallel_3_3_0_0; tagged = doDistribute self.tagged_0_8_10; unordered-containers = doDistribute self.unordered-containers_0_2_21; @@ -85,6 +88,8 @@ with haskellLib; primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working. splitmix = doJailbreak super.splitmix; # base <4.22 + # https://github.com/phadej/boring/issues/48 + boring = doJailbreak super.boring; # https://github.com/haskellari/indexed-traversable/issues/49 indexed-traversable = doJailbreak super.indexed-traversable; # https://github.com/haskellari/indexed-traversable/issues/50 @@ -121,6 +126,20 @@ with haskellLib; # https://github.com/sjakobi/newtype-generics/pull/28/files newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics); + # haskell-debugger only works with ghc 9.14+ + haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view); + haskell-debugger = doJailbreak super.haskell-debugger; # hie-bios < 0.18, random >=1.3.1 + + ghc-exactprint_1_14_0_0 = addBuildDepends [ + # cabal2nix drops conditional block: impl (ghc >= 9.14) + self.Diff + self.extra + self.ghc-paths + self.silently + self.syb + self.HUnit + ] super.ghc-exactprint_1_14_0_0; + # # Test suite issues # diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index faa3ab33c3a5..0179c4ca4e48 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -133,6 +133,7 @@ package-maintainers: - ghcjs-dom - ghcjs-dom-javascript - ghcjs-dom-jsaddle + - haskell-debugger - jsaddle - jsaddle-clib - jsaddle-dom diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index cb6cd01b488b..d1d86c159d5b 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -1966,6 +1966,9 @@ builtins.intersectAttrs super { broken = false; }) super.cabal-install; + # lots of errors + haskell-debugger = dontCheck super.haskell-debugger; + keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic; # Disable checks to break dependency loop with SCalendar