From a1f88264cf4d90354d84400351e2a31e196625fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 10 Mar 2012 17:30:51 +0000 Subject: [PATCH] Binary is a GHC core package since GHC-7.2. svn path=/nixpkgs/trunk/; revision=32974 --- 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 36ba517d8d4..8a2b47a092c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -166,10 +166,12 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_future = self : self.haskellPlatformArgs_future self // { mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok + binary = null; # now a core package }; haskellPlatformDefaults_HEAD = self : self.haskellPlatformDefaults_future self // { + binary = null; # now a core package }; haskellPlatformArgs_2011_4_0_0 = self : { @@ -466,7 +468,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bimap = callPackage ../development/libraries/haskell/bimap {}; - binary = callPackage ../development/libraries/haskell/binary {}; + binary_hackage = callPackage ../development/libraries/haskell/binary {}; + binary = self.binary_hackage; # core package since ghc-7.2.1 binaryShared = callPackage ../development/libraries/haskell/binary-shared {};