diff options
| author | Michael Alan Dorman <mdorman@ironicdesign.com> | 2019-09-05 15:20:03 +0300 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2019-09-06 17:27:21 +0200 |
| commit | 4037a43630da4306be03d31bd86359c8713c02dc (patch) | |
| tree | 9268f2db8ff69fcfe2093d367f810dafd3e6545f /pkgs | |
| parent | 62771c8774c18779cdc3f5830ce3ffcc3672ef0d (diff) | |
| download | nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar.gz nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar.bz2 nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar.lz nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar.xz nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.tar.zst nixpkgs-4037a43630da4306be03d31bd86359c8713c02dc.zip | |
jailbreak-cabal: updated package needs updated Cabal library
Only needs to be overridden for prior GHC releases.
Diffstat (limited to 'pkgs')
3 files changed, 4 insertions, 2 deletions
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 76aabb91561..8e796aa3f1f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -43,8 +43,8 @@ self: super: { stm = self.stm_2_5_0_0; text = self.text_1_2_4_0; - # Build with the latest Cabal version, which works best albeit not perfectly. - jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_2_2_0_1; }; + # Needs Cabal 3.0.x. + jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_0_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 0919292d44a..513c55ea9e9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -42,6 +42,7 @@ self: super: { # 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; }; # 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 4addc834040..d2e463b123c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -43,6 +43,7 @@ self: super: { # 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; }; # https://github.com/tibbe/unordered-containers/issues/214 unordered-containers = dontCheck super.unordered-containers; |