From 164c578c96e4a85408bb9fea2dc54751d8af11c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 28 Jun 2014 16:50:35 +0200 Subject: [PATCH] haskell-cabal-bounds: GHC 7.8 has only Cabal 1.18 --- pkgs/top-level/haskell-packages.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index df905155b22c..db9d4c30002b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2779,9 +2779,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalDelete = callPackage ../development/tools/haskell/cabal-delete {}; cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { - Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version - then null - else self.Cabal_1_20_0_1; + Cabal = self.Cabal_1_20_0_1; cabalLenses = self.cabalLenses.override { Cabal = self.Cabal_1_20_0_1; };