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

haskell-Cabal: update overrides for the new 3.2.x release

Browse Source
This commit is contained in:
Peter Simons 2020-04-03 21:03:40 +02:00
parent 70a22c5b4b
commit 11d28064b7
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1344,7 +1344,7 @@ self: super: {
}); });
# cabal-fmt requires Cabal3 # cabal-fmt requires Cabal3
cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; }; cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
# Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin
# until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that

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

@ -44,7 +44,7 @@ self: super: {
text = self.text_1_2_4_0; text = self.text_1_2_4_0;
# Needs Cabal 3.0.x. # Needs Cabal 3.0.x.
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# https://github.com/bmillwood/applicative-quoters/issues/6 # https://github.com/bmillwood/applicative-quoters/issues/6
applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {

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

@ -40,9 +40,9 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# Needs Cabal 3.0.x. # Needs Cabal 3.2.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# Restricts aeson to <1.4 # Restricts aeson to <1.4
# https://github.com/purescript/purescript/pull/3537 # https://github.com/purescript/purescript/pull/3537

10
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -42,8 +42,8 @@ self: super: {
xhtml = null; xhtml = null;
# Needs Cabal 3.0.x. # Needs Cabal 3.0.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
# https://github.com/tibbe/unordered-containers/issues/214 # https://github.com/tibbe/unordered-containers/issues/214
unordered-containers = dontCheck super.unordered-containers; unordered-containers = dontCheck super.unordered-containers;
@ -76,12 +76,10 @@ self: super: {
# cabal2nix needs the latest version of Cabal, and the one # cabal2nix needs the latest version of Cabal, and the one
# hackage-db uses must match, so take the latest # hackage-db uses must match, so take the latest
cabal2nix = super.cabal2nix.overrideScope (self: super: { cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
Cabal = self.Cabal_3_0_0_0;
});
# cabal2spec needs a recent version of Cabal # cabal2spec needs a recent version of Cabal
cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
# Builds only with ghc-8.8.x and beyond. # Builds only with ghc-8.8.x and beyond.
policeman = markBroken super.policeman; policeman = markBroken super.policeman;

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

@ -41,10 +41,13 @@ self: super: {
unix = null; unix = null;
xhtml = null; xhtml = null;
# These builds need Cabal 3.2.x.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; hackage-security = self.hackage-security_0_6_0_0; });
# Ignore overly restrictive upper version bounds. # Ignore overly restrictive upper version bounds.
aeson-diff = doJailbreak super.aeson-diff; aeson-diff = doJailbreak super.aeson-diff;
async = doJailbreak super.async; async = doJailbreak super.async;
cabal-install = doJailbreak super.cabal-install;
ChasingBottoms = doJailbreak super.ChasingBottoms; ChasingBottoms = doJailbreak super.ChasingBottoms;
chell = doJailbreak super.chell; chell = doJailbreak super.chell;
cryptohash-sha256 = doJailbreak super.cryptohash-sha256; cryptohash-sha256 = doJailbreak super.cryptohash-sha256;