From 1268b3825433cd019d673bc43cd5fa23b2a787c4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 25 Nov 2018 22:47:25 +0000 Subject: [PATCH] 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. --- pkgs/development/haskell-modules/configuration-ghc-head.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 99f4cd87ce5..b71f75033f0 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;