From 11d28064b78bafff02b56b390d659e14e655e3de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 3 Apr 2020 21:03:40 +0200 Subject: haskell-Cabal: update overrides for the new 3.2.x release --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 2 +- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 6 +++--- pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 10 ++++------ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 5 ++++- 5 files changed, 13 insertions(+), 12 deletions(-) (limited to 'pkgs/development') diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5c44fe17f91a..7d9db5dd6cbe 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1344,7 +1344,7 @@ self: super: { }); # 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 # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index 045c5dc1e5b1..ce52ccb11693 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -44,7 +44,7 @@ self: super: { text = self.text_1_2_4_0; # 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 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index c4c5ed9422f7..785bab743a4f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -40,9 +40,9 @@ self: super: { unix = null; xhtml = null; - # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; }; + # Needs Cabal 3.2.x. + 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_2_0_0; }; # Restricts aeson to <1.4 # https://github.com/purescript/purescript/pull/3537 diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 9461f6cf34df..ff69c809288a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -42,8 +42,8 @@ self: super: { xhtml = null; # Needs Cabal 3.0.x. - cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; }); - jailbreak-cabal = super.jailbreak-cabal.override { 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_2_0_0; }; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; @@ -76,12 +76,10 @@ self: super: { # cabal2nix needs the latest version of Cabal, and the one # hackage-db uses must match, so take the latest - cabal2nix = super.cabal2nix.overrideScope (self: super: { - Cabal = self.Cabal_3_0_0_0; - }); + cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); # 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. policeman = markBroken super.policeman; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 1b5f64bea6b8..70de06efd5f9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,10 +41,13 @@ self: super: { unix = 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. aeson-diff = doJailbreak super.aeson-diff; async = doJailbreak super.async; - cabal-install = doJailbreak super.cabal-install; ChasingBottoms = doJailbreak super.ChasingBottoms; chell = doJailbreak super.chell; cryptohash-sha256 = doJailbreak super.cryptohash-sha256; -- cgit 1.4.1