colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

haskell.packages.{ghc88,ghc810}.base-compat-batteries: loosen OneTuple bound

Browse Source 
Loosening the bound seems easier than downgrading OneTuple in these package sets.
See also the linked issue.
This commit is contained in:
sternenseemann 2023-07-02 14:03:22 +02:00
parent 6cc8bbe4b6
commit 54ebdad42d
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -55,7 +55,13 @@ self: super: {
system-cxx-std-lib = null;
# Additionally depends on OneTuple for GHC < 9.0
base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries;
# https://github.com/haskell-compat/base-compat/issues/91
base-compat-batteries = addBuildDepend self.OneTuple (overrideCabal (drv: {
postPatch = ''
${drv.postPatch or ""}
sed -i 's/OneTuple >= 0.3 && < 0.4/OneTuple/' *.cabal
'';
}) 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;

8
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -61,7 +61,13 @@ self: super: {
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
# Additionally depends on OneTuple for GHC < 9.0
base-compat-batteries = addBuildDepend self.OneTuple super.base-compat-batteries;
# https://github.com/haskell-compat/base-compat/issues/91
base-compat-batteries = addBuildDepend self.OneTuple (overrideCabal (drv: {
postPatch = ''
${drv.postPatch or ""}
sed -i 's/OneTuple >= 0.3 && < 0.4/OneTuple/' *.cabal
'';
}) 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;