about summary refs log tree commit diff
path: root/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2015-01-10 18:50:49 +0100
committerPeter Simons <simons@cryp.to>2015-01-10 18:50:49 +0100
commit7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d (patch)
treece8bd7795ff3301ef94e28600d83156195598c40 /pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
parente4c9a521ef4fdf08ac8bd2db6e74c84e9f6bfd51 (diff)
downloadnixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar.gz
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar.bz2
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar.lz
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar.xz
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.tar.zst
nixlib-7e2f1493b72a8ff400c34197dc37fea5b5b3ae0d.zip
haskell-ng: update to jailbreak-cabal 1.2, which supports Cabal 1.22.x now
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix')
-rw-r--r--pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
index 341429bbc1d4..77190c3f8625 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.9.x.nix
@@ -30,9 +30,8 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # We cannot build jailbreak without Cabal 1.20.x, and we cannot build
-  # Cabal 1.20.x without jailbreak. Go figure. Let's use a sledgehammer.
-  jailbreak-cabal = pkgs.haskellngPackages.jailbreak-cabal;
+  # We have Cabal 1.22.x.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # GHC 7.10.x's Haddock binary cannot generate hoogle files.
   # https://ghc.haskell.org/trac/ghc/ticket/9921