Author: andres
Date: Thu Jul 22 18:47:59 2010
New Revision: 22715
URL: https://svn.nixos.org/websvn/nix/?rev=22715&sc=1
Log:
Switched the default version of ghc and Haskell Platform to 6.12.3 and
2010.2.0.0.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
- copied, changed from r22714,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/default.nix
Modified:
nixpkgs/trunk/pkgs/tools/typesetting/lhs2tex/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
nixpkgs/trunk/pkgs/top-level/release.nix
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
(from r22714,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-platform/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/tools/typesetting/lhs2tex/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/typesetting/lhs2tex/default.nix Thu Jul 22
18:04:39 2010 (r22714)
+++ nixpkgs/trunk/pkgs/tools/typesetting/lhs2tex/default.nix Thu Jul 22
18:47:59 2010 (r22715)
@@ -1,13 +1,13 @@
-{cabal, tetex, polytable, regexCompat, utf8String}:
+{cabal, tetex, polytable, regexCompat}:
#assert tetex == polytable.tetex;
cabal.mkDerivation (self : {
pname = "lhs2tex";
- version = "1.15";
+ version = "1.16";
name = self.fname;
- sha256 = "77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124";
- extraBuildInputs = [tetex regexCompat utf8String];
+ sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
+ extraBuildInputs = [tetex regexCompat];
propagatedBuildInputs = [polytable]; # automatically in user-env now with
cabal
postInstall = ''
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jul 22 18:04:39
2010 (r22714)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Thu Jul 22 18:47:59
2010 (r22715)
@@ -2387,7 +2387,7 @@
# packages.
# This should point to the current default version.
- haskellPackages = haskellPackages_ghc6104;
+ haskellPackages = haskellPackages_ghc6123;
# Old versions of ghc that currently don't build because the binary
# is broken.
@@ -2472,15 +2472,14 @@
haskellPackages_ghc6104 =
haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false;
- # We will soon switch to ghc-6.12.* as default.
- haskellPackages_ghc6121 = lowPrio
- (haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false);
+ haskellPackages_ghc6121 =
+ haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false;
- haskellPackages_ghc6122 = lowPrio
- (haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false);
+ haskellPackages_ghc6122 =
+ haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false;
- haskellPackages_ghc6123 = lowPrio
- (haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false);
+ haskellPackages_ghc6123 =
+ haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false;
# Currently not pointing to the actual HEAD, therefore disabled
/*
@@ -7672,7 +7671,7 @@
inherit (gtkLibs) gtk glib;
};
- darcs = haskellPackages_ghc6104.darcs;
+ darcs = haskellPackages.darcs;
dia = import ../applications/graphics/dia {
inherit stdenv fetchurl pkgconfig perl perlXMLParser
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Jul 22 18:04:39
2010 (r22714)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Thu Jul 22 18:47:59
2010 (r22715)
@@ -341,7 +341,9 @@
inherit cabal haskellSrcExts;
};
- haskellPlatform2010200 = pkgs.lowPrio (import
../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
+ haskellPlatform = haskellPlatform2010200;
+
+ haskellPlatform2010200 = import
../development/libraries/haskell/haskell-platform/2010.2.0.0.nix {
inherit cabal ghc
html xhtml;
haskellSrc = haskellSrcP;
@@ -364,7 +366,7 @@
haddock = haddock272P;
happy = happy1185;
inherit (pkgs) fetchurl;
- });
+ };
haskellPlatform2010100 = pkgs.lowPrio (import
../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
inherit cabal ghc fgl
@@ -389,7 +391,7 @@
inherit (pkgs) fetchurl;
});
- haskellPlatform = import ../development/libraries/haskell/haskell-platform {
+ haskellPlatform2009202 = import
../development/libraries/haskell/haskell-platform/2009.2.0.2.nix {
inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
haskellSrc html parallel regexBase regexCompat regexPosix
stm time xhtml zlib cabalInstall alex happy haddock;
@@ -1160,7 +1162,7 @@
};
lhs2tex = import ../tools/typesetting/lhs2tex {
- inherit cabal regexCompat utf8String;
+ inherit cabal regexCompat;
inherit (pkgs) tetex polytable;
};
Modified: nixpkgs/trunk/pkgs/top-level/release.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/release.nix Thu Jul 22 18:04:39 2010
(r22714)
+++ nixpkgs/trunk/pkgs/top-level/release.nix Thu Jul 22 18:47:59 2010
(r22715)
@@ -412,12 +412,11 @@
haskellPackages_ghc6104 = {
darcs = ghcSupported;
ghc = ghcSupported;
+ gitit = linux;
gtk2hs = linux;
leksah = linux;
- lhs2tex = ghcSupported;
haskellPlatform = ghcSupported;
xmonad = linux;
- gitit = linux;
};
haskellPackages_ghc6121 = {
@@ -432,6 +431,14 @@
haskellPlatform2010100 = ghcSupported;
};
+ haskellPackages_ghc6123 = {
+ darcs = ghcSupported;
+ ghc = ghcSupported;
+ haskellPlatform2010200 = ghcSupported;
+ lhs2tex = ghcSupported;
+ xmonad = linux;
+ };
+
kde3 = {
kdebase = linux;
kdelibs = linux;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
