From c1f8889beb3242322aa972019b417913a54e00a9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Fri, 25 Mar 2022 13:21:16 +0100 Subject: [PATCH] haskell.packages.ghc{884,8017}.mysql-simple: provide blaze-textual The package shims blaze-textual for GHC >= 9.0 and makes its inclusion conditional, causing hackage2nix to miss this dependency. --- .../haskell-modules/configuration-ghc-8.10.x.nix | 6 ++++++ .../development/haskell-modules/configuration-ghc-8.8.x.nix | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index daa8d0389e86..2f11410661bd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -113,4 +113,10 @@ self: super: { OneTuple = super.OneTuple.override { ghc-prim = self.hashable; }; + + # Temporarily disabled blaze-textual for GHC >= 9.0 causing hackage2nix ignoring it + # https://github.com/paul-rouse/mysql-simple/blob/872604f87044ff6d1a240d9819a16c2bdf4ed8f5/Database/MySQL/Internal/Blaze.hs#L4-L10 + mysql-simple = addBuildDepends [ + self.blaze-textual + ] super.mysql-simple; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 6b6a40cc8dc7..0ff1294c1dbf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -147,4 +147,10 @@ self: super: { OneTuple = super.OneTuple.override { ghc-prim = self.hashable; }; + + # Temporarily disabled blaze-textual for GHC >= 9.0 causing hackage2nix ignoring it + # https://github.com/paul-rouse/mysql-simple/blob/872604f87044ff6d1a240d9819a16c2bdf4ed8f5/Database/MySQL/Internal/Blaze.hs#L4-L10 + mysql-simple = addBuildDepends [ + self.blaze-textual + ] super.mysql-simple; }