From d6aedf7bcd2713f538096d124879861d54705243 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2020 20:41:50 +0200 Subject: [PATCH] haskell-ghc-lib-parser-ex: fix build with GHC versions prior to 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index a607bc0b53b..f1260735479 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -91,4 +91,7 @@ self: super: { ListLike = addBuildDepend super.ListLike self.semigroups; base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 72c06d6d8ab..d5ae77e8246 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -86,4 +86,7 @@ self: super: { # The old Haddock cannot process the newer documentation syntax. fast-logger = dontHaddock super.fast-logger; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ff69c809288..d2eb43c7ca5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -88,4 +88,7 @@ self: super: { stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; })); haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + }