From d0d8f88d9b385686b4ace869fddf821336d41c6c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Dec 2013 22:01:15 +0100 Subject: [PATCH] haskell-packages.nix: disable transformers 0.3.0.0 when building with GHC 7.7 or later It's a core package now. --- pkgs/top-level/haskell-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6c3788f08199..266ad4f55ace 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -169,7 +169,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x stm = self.stm_2_4_2; syb = self.syb_0_4_1; text = self.text_0_11_3_1; - transformers = null; # this has become a core package in GHC 7.7 + transformers = self.transformers_0_3_0_0; # this has become a core package in GHC 7.7 unorderedContainers = self.unorderedContainers_0_2_3_3; vector = self.vector_0_10_9_1; xhtml = self.xhtml_3000_2_1; @@ -2179,7 +2179,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x tlsExtra = callPackage ../development/libraries/haskell/tls-extra {}; transformers_0_2_2_0 = callPackage ../development/libraries/haskell/transformers/0.2.2.0.nix {}; - transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; + transformers_0_3_0_0 = if (pkgs.stdenv.lib.versionOlder ghc.version "7.7") then + (callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}) else null; transformers = self.transformers_0_3_0_0; transformersBase = callPackage ../development/libraries/haskell/transformers-base {};