summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2018-05-28 16:19:58 +0200
committerPeter Simons <simons@cryp.to>2018-05-30 03:46:16 +0200
commit5b73d202abb58aa4ea199a4c30139fe3ef1719ec (patch)
tree46d3b86c95d703bcc5f6df06fe32753e381f8f04 /pkgs
parent852e9dc448fcaab4a6bf62e22cfc49cf1be8c00d (diff)
downloadnixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar.gz
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar.bz2
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar.lz
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar.xz
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.tar.zst
nixpkgs-5b73d202abb58aa4ea199a4c30139fe3ef1719ec.zip
haskell-jailbreak-cabal: build with Cabal 2.2.x in ghc-8.2.x package set
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix4
1 files 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 d1bb60e8395..ce24d9a27f4 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 {