public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched the default version of ghc and Haskell Platform to 6.12.3 and 2010.2.0.0.

Browse Source 
svn path=/nixpkgs/trunk/; revision=22715
This commit is contained in:
Andres Löh 2010-07-22 18:47:59 +00:00
parent 6c90771ac6
commit 73bee7da33
5 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/haskell/haskell-platform/default.nix → pkgs/development/libraries/haskell/haskell-platform/2009.2.0.2.nix
View File

8
pkgs/tools/typesetting/lhs2tex/default.nix
View File

@ -1,13 +1,13 @@
{cabal, tetex, polytable, regexCompat, utf8String}: {cabal, tetex, polytable, regexCompat}:
#assert tetex == polytable.tetex; #assert tetex == polytable.tetex;
cabal.mkDerivation (self : { cabal.mkDerivation (self : {
pname = "lhs2tex"; pname = "lhs2tex";
version = "1.15"; version = "1.16";
name = self.fname; name = self.fname;
sha256 = "77f25c1f22823587ceca6eead133a403540319a0ae3bf03a369b3e8c86baf124"; sha256 = "aa43ec92e8d7c94213365a7211d605314476977155e36420caa3cfb394f7c76f";
extraBuildInputs = [tetex regexCompat utf8String]; extraBuildInputs = [tetex regexCompat];
propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal propagatedBuildInputs = [polytable]; # automatically in user-env now with cabal
postInstall = '' postInstall = ''

17
pkgs/top-level/all-packages.nix
View File

@ -2387,7 +2387,7 @@ let
# packages. # packages.
# This should point to the current default version. # 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 # Old versions of ghc that currently don't build because the binary
# is broken. # is broken.
@ -2472,15 +2472,14 @@ let
haskellPackages_ghc6104 = haskellPackages_ghc6104 =
haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false; haskellPackagesFun610 ../development/compilers/ghc/6.10.4.nix false;
# We will soon switch to ghc-6.12.* as default. haskellPackages_ghc6121 =
haskellPackages_ghc6121 = lowPrio haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false;
(haskellPackagesFun612 ../development/compilers/ghc/6.12.1.nix false);
haskellPackages_ghc6122 = lowPrio haskellPackages_ghc6122 =
(haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false); haskellPackagesFun612 ../development/compilers/ghc/6.12.2.nix false;
haskellPackages_ghc6123 = lowPrio haskellPackages_ghc6123 =
(haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false); haskellPackagesFun612 ../development/compilers/ghc/6.12.3.nix false;
# Currently not pointing to the actual HEAD, therefore disabled # Currently not pointing to the actual HEAD, therefore disabled
/* /*
@ -7672,7 +7671,7 @@ let
inherit (gtkLibs) gtk glib; inherit (gtkLibs) gtk glib;
}; };
darcs = haskellPackages_ghc6104.darcs; darcs = haskellPackages.darcs;
dia = import ../applications/graphics/dia { dia = import ../applications/graphics/dia {
inherit stdenv fetchurl pkgconfig perl perlXMLParser inherit stdenv fetchurl pkgconfig perl perlXMLParser

10
pkgs/top-level/haskell-packages.nix
View File

@ -341,7 +341,9 @@ rec {
inherit cabal haskellSrcExts; 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 inherit cabal ghc
html xhtml; html xhtml;
haskellSrc = haskellSrcP; haskellSrc = haskellSrcP;
@ -364,7 +366,7 @@ rec {
haddock = haddock272P; haddock = haddock272P;
happy = happy1185; happy = happy1185;
inherit (pkgs) fetchurl; inherit (pkgs) fetchurl;
}); };
haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix { haskellPlatform2010100 = pkgs.lowPrio (import ../development/libraries/haskell/haskell-platform/2010.1.0.0.nix {
inherit cabal ghc fgl inherit cabal ghc fgl
@ -389,7 +391,7 @@ rec {
inherit (pkgs) fetchurl; 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 inherit cabal ghc GLUT HTTP HUnit OpenGL QuickCheck cgi fgl editline
haskellSrc html parallel regexBase regexCompat regexPosix haskellSrc html parallel regexBase regexCompat regexPosix
stm time xhtml zlib cabalInstall alex happy haddock; stm time xhtml zlib cabalInstall alex happy haddock;
@ -1160,7 +1162,7 @@ rec {
}; };
lhs2tex = import ../tools/typesetting/lhs2tex { lhs2tex = import ../tools/typesetting/lhs2tex {
inherit cabal regexCompat utf8String; inherit cabal regexCompat;
inherit (pkgs) tetex polytable; inherit (pkgs) tetex polytable;
}; };

11
pkgs/top-level/release.nix
View File

@ -412,12 +412,11 @@ with (import ./release-lib.nix);
haskellPackages_ghc6104 = { haskellPackages_ghc6104 = {
darcs = ghcSupported; darcs = ghcSupported;
ghc = ghcSupported; ghc = ghcSupported;
gitit = linux;
gtk2hs = linux; gtk2hs = linux;
leksah = linux; leksah = linux;
lhs2tex = ghcSupported;
haskellPlatform = ghcSupported; haskellPlatform = ghcSupported;
xmonad = linux; xmonad = linux;
gitit = linux;
}; };
haskellPackages_ghc6121 = { haskellPackages_ghc6121 = {
@ -432,6 +431,14 @@ with (import ./release-lib.nix);
haskellPlatform2010100 = ghcSupported; haskellPlatform2010100 = ghcSupported;
}; };
haskellPackages_ghc6123 = {
darcs = ghcSupported;
ghc = ghcSupported;
haskellPlatform2010200 = ghcSupported;
lhs2tex = ghcSupported;
xmonad = linux;
};
kde3 = { kde3 = {
kdebase = linux; kdebase = linux;
kdelibs = linux; kdelibs = linux;