about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-head.nix
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2018-11-25 22:47:25 +0000
committerAlyssa Ross <hi@alyssa.is>2018-11-25 22:47:25 +0000
commit1268b3825433cd019d673bc43cd5fa23b2a787c4 (patch)
treeda2f2195835df63bc8c58d39a41ed1c24f983b48 /pkgs/development/haskell-modules/configuration-ghc-head.nix
parent71c49d5796a9bc276b7823e38807e41bcc2c887e (diff)
downloadnixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar.gz
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar.bz2
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar.lz
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar.xz
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.tar.zst
nixlib-1268b3825433cd019d673bc43cd5fa23b2a787c4.zip
Revert "Use older version of jailbreak-cabal with ghcHEAD"
This reverts commit d13f7c54e30b5eb9e90f226d2a947f66a0ce1b38.

ghc802 is no longer in Nixpkgs as of
2f0de54ddbfdb03540128f8d2abcc47221d42b25.

The Cabal bug that ghc802 was a workaround for was fixed in Cabal 2.2,
though, so this shouldn't be necessary any more.

Upstream bugs:
https://github.com/peti/jailbreak-cabal/issues/13
https://github.com/haskell/cabal/issues/4719

Fixes https://github.com/NixOS/nixpkgs/issues/51042.
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-head.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-head.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 99f4cd87ce56..b71f75033f08 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -40,7 +40,7 @@ self: super: {
   xhtml = null;
 
   # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = pkgs.haskell.packages.ghc802.jailbreak-cabal;
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;