From 2fccb31598aa0e858ccf9eaea369a720294099b7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 22 Nov 2022 18:12:03 +0100 Subject: [PATCH] haskell.packages.ghc8{8,10}.base-compat-batteries: add missing dep --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 3 +++ 2 files changed, 6 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 1a578dbafbdf..e6d05ab48bba 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -60,6 +60,9 @@ self: super: { process = self.process_1_6_16_0; }); + # Additionally depends on OneTuple for GHC < 9.0 + base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; + # Pick right versions for GHC-specific packages ghc-api-compat = doDistribute self.ghc-api-compat_8_10_7; 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 dbb550f6fd00..9db66d696fb0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -66,6 +66,9 @@ self: super: { process = self.process_1_6_16_0; }); + # Additionally depends on OneTuple for GHC < 9.0 + base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; + # Ignore overly restrictive upper version bounds. aeson-diff = doJailbreak super.aeson-diff; async = doJailbreak super.async;