diff options
author | sternenseemann <sternenseemann@systemli.org> | 2024-01-13 15:22:52 +0100 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2024-01-13 15:24:13 +0100 |
commit | c312cd21f623826adf523ad5e6cc176efa209928 (patch) | |
tree | 78290308ae758f8122fb45595036d32a50fa41e3 | |
parent | 1ef945a916f6bd25d80d57602dfbeb8bb8514d81 (diff) |
haskell.packages.*.base-compat-batteries: provide extra compat deps
4 files changed, 16 insertions, 3 deletions
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 f2b39cf1ae49e..137647da8b51b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -59,9 +59,6 @@ self: super: { # their existence to callPackages, but their is no shim for lower GHC versions. system-cxx-std-lib = null; - # Additionally depends on OneTuple for GHC < 9.0 - base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries; - # For GHC < 9.4, some packages need data-array-byte as an extra dependency primitive = addBuildDepends [ self.data-array-byte ] super.primitive; hashable = addBuildDepends [ @@ -173,6 +170,10 @@ self: super: { indexed-traversable these ; + base-compat-batteries = addBuildDepends [ + self.foldable1-classes-compat + self.OneTuple + ] super.base-compat-batteries; # OneTuple needs hashable (instead of ghc-prim) and foldable1-classes-compat for GHC < 9 OneTuple = addBuildDepends [ 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 e95b1a1c6eb40..5b17975ca8b70 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -145,6 +145,10 @@ self: super: { indexed-traversable these ; + base-compat-batteries = addBuildDepends [ + self.foldable1-classes-compat + self.OneTuple + ] super.base-compat-batteries; OneTuple = addBuildDepends [ self.foldable1-classes-compat self.base-orphans diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 48d67fc133ccd..24ccbf70face9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -138,4 +138,8 @@ self: super: { OneTuple these ; + base-compat-batteries = addBuildDepends [ + self.foldable1-classes-compat + self.OneTuple + ] super.base-compat-batteries; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 7ddee50dff3e3..b91dfaf573c17 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -139,4 +139,8 @@ in { OneTuple these ; + base-compat-batteries = addBuildDepends [ + self.foldable1-classes-compat + self.OneTuple + ] super.base-compat-batteries; } |