Author: andres
Date: Tue Sep 7 12:58:01 2010
New Revision: 23669
URL: https://svn.nixos.org/websvn/nix/?rev=23669&sc=1
Log:
Small refactoring to prepare for future changes.
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Sep 7 12:56:49
2010 (r23668)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Tue Sep 7 12:58:01
2010 (r23669)
@@ -212,9 +212,8 @@
haskellPlatform = haskellPlatform_2010_2_0_0;
- haskellPlatform_2010_2_0_0 = import
../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
- inherit cabal ghc
- html xhtml;
+ haskellPlatformArgs_2010_2_0_0 = {
+ inherit cabal ghc html xhtml;
haskellSrc = haskellSrc_P;
fgl = fgl_5_4_2_3;
cabalInstall = cabalInstall_0_8_2;
@@ -234,9 +233,14 @@
stm = stm_2_1_2_1;
haddock = haddock_2_7_2_P;
happy = happy_1_18_5;
- inherit (pkgs) fetchurl;
};
+ haskellPlatformDefaults_2010_2_0_0 = haskellPlatformArgs_2010_2_0_0 // {
+ haskellPlatform = haskellPlatform_2010_2_0_0;
+ };
+
+ haskellPlatform_2010_2_0_0 = callPackage
../development/libraries/haskell/haskell-platform/2010.2.0.0.nix
haskellPlatformArgs_2010_2_0_0;
+
haskellPlatform_2010_1_0_0 = pkgs.lowPrio (import
../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
inherit cabal ghc fgl
haskellSrc html
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
