From dcffa6f0b1b5e6a49f4e378e7dd41feca567c9fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Fri, 5 Aug 2011 10:10:58 +0000 Subject: [PATCH] Fixed broken haskell-packages.nix. svn path=/nixpkgs/trunk/; revision=28164 --- pkgs/top-level/haskell-packages.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 03e2dc908103..9c9cf808947c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -155,14 +155,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatformDefaults_future = self : self.haskellPlatformArgs_future self // { - haskellPlatform = self.haskellPlatform_future; mtl1 = self.mtl_1_1_1_1; }; - haskellPlatform_future = - callPackage ../development/libraries/haskell/haskell-platform/2011.2.0.1.nix - (self.haskellPlatformArgs_future self); - haskellPlatformArgs_2011_2_0_1 = self : { inherit (self) cabal ghc; cgi = self.cgi_3001_1_7_4; @@ -349,6 +344,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellPlatform = self.haskellPlatform_2009_2_0_2; }; + haskellPlatform_2009_2_0_2 = + callPackage ../development/libraries/haskell/haskell-platform/2009.2.0.2.nix + (self.haskellPlatformArgs_2009_2_0_2 self); + # Haskell libraries.