about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-28 16:50:35 +0200
committerBenno Fünfstück <benno.fuenfstueck@gmail.com>2014-06-28 16:50:35 +0200
commit164c578c96e4a85408bb9fea2dc54751d8af11c3 (patch)
tree47d23745d94e6db0206ccd6170762f2c874563b9
parent4c2a206d537ccdcdcdf69b97f11ad9fd0a39469f (diff)
downloadnixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar.gz
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar.bz2
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar.lz
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar.xz
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.tar.zst
nixlib-164c578c96e4a85408bb9fea2dc54751d8af11c3.zip
haskell-cabal-bounds: GHC 7.8 has only Cabal 1.18
-rw-r--r--pkgs/top-level/haskell-packages.nix4
1 files changed, 1 insertions, 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;
     };