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

Updated the GHC HEAD snapshot.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30937
This commit is contained in:
Andres Löh
2011-12-16 18:11:23 +00:00
parent c919a8ae21
commit c11749dcd6
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2233,7 +2233,8 @@ let
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD =
haskellPackagesFun ../development/compilers/ghc/head.nix
ghc6121Binary (x : x.ghcHEADPrefs) false false lowPrio;
(haskellPackages_ghc704.ghcWithPackages (self : [ self.alex self.happy ]))
(x : x.ghcHEADPrefs) false false lowPrio;
haxeDist = import ../development/compilers/haxe {
inherit fetchurl sourceFromHead stdenv lib ocaml zlib makeWrapper neko;

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

@@ -89,8 +89,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghc703Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super;
ghc704Prefs = super : super // super.haskellPlatformDefaults_2011_2_0_1 super; # link
ghc721Prefs = super : super // super.haskellPlatformDefaults_future super;
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super;
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_future super; # link
ghc722Prefs = super : super // super.haskellPlatformDefaults_future super; #link
ghcHEADPrefs = super : super // super.haskellPlatformDefaults_HEAD super;
# GHC and its wrapper
#
@@ -142,9 +142,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok
network = self.network_2_3_0_8; # 7.2 ok, 7.3 ok
OpenGL = self.OpenGL_2_2_3_0; # 7.2 ok, 7.3 ok
parallel = self.parallel_3_1_0_1; # 7.2 ok, 7.3 ok
parallel = self.parallel_3_2_0_0; # 7.2 ok, 7.3 ok
parsec = self.parsec_3_1_2; # 7.2 ok, 7.3 ok
QuickCheck = self.QuickCheck_2_4_0_1; # 7.2 ok, 7.3 ok
QuickCheck = self.QuickCheck_2_4_1_1; # 7.2 ok, 7.3 ok
regexBase = self.regexBase_0_93_2; # 7.2 ok, 7.3 ok
regexCompat = self.regexCompat_0_93_1; # 7.2 ok, 7.3 ok
regexPosix = self.regexPosix_0_94_4; # 7.2 ok, 7.3 ok
@@ -169,6 +169,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
mtl1 = self.mtl_1_1_1_1; # 7.2 ok, 7.3 ok
};
haskellPlatformDefaults_HEAD =
self : self.haskellPlatformDefaults_future self // {
deepseq = null; # apparently a core library in ghc-7.3
};
haskellPlatformArgs_2011_2_0_1 = self : {
inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4;