Author: andres
Date: Fri Apr 20 12:22:23 2012
New Revision: 33858
URL: https://nixos.org/websvn/nix/?rev=33858&sc=1
Log:
New GHC snapshots.
Added:
nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix
- copied, changed from r33856,
nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
Modified:
nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix
(from r33856, nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Fri Apr 20
11:35:20 2012 (r33856, copy source)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/7.4.2.nix Fri Apr 20
12:22:23 2012 (r33858)
@@ -1,13 +1,13 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
- version = "7.4.0.20120126";
+ version = "7.4.1.20120412";
name = "ghc-${version}";
src = fetchurl {
- url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";;
- sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
+ url = "http://haskell.org/ghc/dist/stable/dist/${name}-src.tar.bz2";;
+ sha256 = "0hpzd51s5nvlsjk3wza45ji5v6m0szqjzch45fvv7wfzllrm595l";
};
buildInputs = [ghc perl gmp ncurses] ++
Modified: nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Fri Apr 20
12:22:08 2012 (r33857)
+++ nixpkgs/trunk/pkgs/development/compilers/ghc/head.nix Fri Apr 20
12:22:23 2012 (r33858)
@@ -1,13 +1,13 @@
{stdenv, fetchurl, ghc, perl, gmp, ncurses, darwinInstallNameToolUtility}:
stdenv.mkDerivation rec {
- version = "7.4.0.20120126";
+ version = "7.5.20120413";
name = "ghc-${version}";
src = fetchurl {
- url = "http://haskell.org/ghc/dist/7.4.1-rc2/${name}-src.tar.bz2";;
- sha256 = "0arnvzhwjzk2z3m2891b4z13p4v1c84f31jgyj13a1fbfpylgs64";
+ url = "http://haskell.org/ghc/dist/current/dist/${name}-src.tar.bz2";;
+ sha256 = "0mvpdibdvbanpia8lngrw6pinn1jm867mjcz55zj5nv8wqhgfs7r";
};
buildInputs = [ghc perl gmp ncurses] ++
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Apr 20 12:22:08
2012 (r33857)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Apr 20 12:22:23
2012 (r33858)
@@ -2307,12 +2307,19 @@
(if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
(x : x.ghc741Prefs) false false lowPrio);
+ # Stable branch snapshot.
+ haskellPackages_ghc742 =
+ recurseIntoAttrs
+ (haskellPackagesFun ../development/compilers/ghc/7.4.2.nix
+ (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+ (x : x.ghcHEADPrefs) false false lowPrio);
+
# Reasonably current HEAD snapshot. Should *always* be lowPrio.
haskellPackages_ghcHEAD =
recurseIntoAttrs
(haskellPackagesFun ../development/compilers/ghc/head.nix
# (haskellPackages_ghc704.ghcWithPackages (self : [ self.alex
self.happy ]))
- (if stdenv.isDarwin then ghc704Binary else ghc6121Binary)
+ ghc704Binary
(x : x.ghcHEADPrefs) false false lowPrio);
haxeDist = import ../development/compilers/haxe {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
