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

haskell-base-compat-batteries: fix build with ghc 8.2.2 and 8.4.4

Browse Source
This commit is contained in:
Peter Simons 2019-02-24 10:06:07 +01:00
parent 10e7cf92bc
commit 1f2d0a3569
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix
View File

@ -92,7 +92,8 @@ self: super: {
hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); hackage-db_2_0_1 = super.hackage-db_2_0_1.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; }); stack = super.stack.overrideScope (self: super: { Cabal = self.Cabal_2_2_0_1; });
# GHC 8.2 doesn't have semigroups included by default # Older GHC versions need these additional dependencies.
ListLike = addBuildDepend super.ListLike self.semigroups; ListLike = addBuildDepend super.ListLike self.semigroups;
base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant;
} }

3
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
View File

@ -71,7 +71,8 @@ self: super: {
yaml = self.yaml_0_11_0_0; yaml = self.yaml_0_11_0_0;
}; };
# cabal2nix doesn't list this because of a conditional on the GHC version. # Older GHC versions need these additional dependencies.
aeson = addBuildDepend super.aeson self.contravariant; aeson = addBuildDepend super.aeson self.contravariant;
base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant;
} }