From 5b73d202abb58aa4ea199a4c30139fe3ef1719ec Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 28 May 2018 16:19:58 +0200 Subject: [PATCH] haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 4 ++-- 1 file changed, 2 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 d1bb60e83958..ce24d9a27f48 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -41,8 +41,8 @@ self: super: { prePatch = "sed -i -e 's/process.*< 1.5,/process,/g' Cabal.cabal"; }); - # jailbreak-cabal doesn't seem to work right with the native Cabal version. - jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal; + # 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; }; # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch {