From 4c2a206d537ccdcdcdf69b97f11ad9fd0a39469f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 28 Jun 2014 16:45:16 +0200 Subject: [PATCH 1/2] haskell-cabal-bounds: update Cabal version --- pkgs/top-level/haskell-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4441a85b199..df905155b22 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2781,7 +2781,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalBounds = callPackage ../development/tools/haskell/cabal-bounds { Cabal = if pkgs.stdenv.lib.versionOlder "7.7" ghc.version then null - else self.Cabal_1_18_1_3; + else self.Cabal_1_20_0_1; + cabalLenses = self.cabalLenses.override { + Cabal = self.Cabal_1_20_0_1; + }; }; cabalMeta = callPackage ../development/tools/haskell/cabal-meta {}; 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 2/2] 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 df905155b22..db9d4c30002 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; };