git.iko.soy/typeable/nixpkgs
on master help sign in
haskell-Cabal: update overrides for the new 3.2.x release
commit11d28064b78bafff02b56b390d659e14e655e3de authorPeter Simons <simons@cryp.to> dateFri 3 Apr 2020, 21:03 (7 years ago) parent70a22c5
5 files changed+13−12
pkgs/development/haskell-modules/configuration-common.nix+1−1 pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix+1−1 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+3−3 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+4−6 pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+4−1
pkgs/development/haskell-modules/configuration-common.nix+1−1
@@ -1344,7 +1344,7 @@ self: super: {
13441344 });
13451345
13461346 # cabal-fmt requires Cabal3
1347− cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_0_0_0; };
1347+ cabal-fmt = super.cabal-fmt.override { Cabal = self.Cabal_3_2_0_0; };
13481348
13491349 # Several gtk2hs-provided packages at v0.13.8.0 fail to build on Darwin
13501350 # until we pick up https://github.com/gtk2hs/gtk2hs/pull/293 so apply that
pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix+1−1
@@ -44,7 +44,7 @@ self: super: {
4444 text = self.text_1_2_4_0;
4545
4646 # Needs Cabal 3.0.x.
47− jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
47+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
4848
4949 # https://github.com/bmillwood/applicative-quoters/issues/6
5050 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {
pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix+3−3
@@ -40,9 +40,9 @@ self: super: {
4040 unix = null;
4141 xhtml = null;
4242
43− # Needs Cabal 3.0.x.
44− cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
45− jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
43+ # Needs Cabal 3.2.x.
44+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
45+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
4646
4747 # Restricts aeson to <1.4
4848 # https://github.com/purescript/purescript/pull/3537
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix+4−6
@@ -42,8 +42,8 @@ self: super: {
4242 xhtml = null;
4343
4444 # Needs Cabal 3.0.x.
45− cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
46− jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_0_0; };
45+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
46+ jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_0_0; };
4747
4848 # https://github.com/tibbe/unordered-containers/issues/214
4949 unordered-containers = dontCheck super.unordered-containers;
@@ -76,12 +76,10 @@ self: super: {
7676
7777 # cabal2nix needs the latest version of Cabal, and the one
7878 # hackage-db uses must match, so take the latest
79− cabal2nix = super.cabal2nix.overrideScope (self: super: {
80− Cabal = self.Cabal_3_0_0_0;
81− });
79+ cabal2nix = super.cabal2nix.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
8280
8381 # cabal2spec needs a recent version of Cabal
84− cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_0_0_0; });
82+ cabal2spec = super.cabal2spec.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; });
8583
8684 # Builds only with ghc-8.8.x and beyond.
8785 policeman = markBroken super.policeman;
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix+4−1
@@ -41,10 +41,13 @@ self: super: {
4141 unix = null;
4242 xhtml = null;
4343
44+ # These builds need Cabal 3.2.x.
45+ cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; };
46+ cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; hackage-security = self.hackage-security_0_6_0_0; });
47+
4448 # Ignore overly restrictive upper version bounds.
4549 aeson-diff = doJailbreak super.aeson-diff;
4650 async = doJailbreak super.async;
47− cabal-install = doJailbreak super.cabal-install;
4851 ChasingBottoms = doJailbreak super.ChasingBottoms;
4952 chell = doJailbreak super.chell;
5053 cryptohash-sha256 = doJailbreak super.cryptohash-sha256;