Merge pull request #69640 from mdorman/cabal2nix-fix

cabal2nix: fix build
This commit is contained in:
Peter Simons 2019-09-27 12:30:52 +02:00 committed by GitHub
commit f439dcd5c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -95,7 +95,11 @@ self: super: {
# Newer versions don't compile. # Newer versions don't compile.
resolv = self.resolv_0_1_1_2; resolv = self.resolv_0_1_1_2;
# cabal2nix needs the latest version of Cabal. # cabal2nix needs the latest version of Cabal, and the one
cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); # hackage-db uses must match, so take the latest
cabal2nix = super.cabal2nix.overrideScope (self: super: {
Cabal = self.Cabal_3_0_0_0;
hackage-db = self.hackage-db_2_1_0;
});
} }