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

ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202

Browse Source
This commit is contained in:
Peter Simons 2013-12-02 21:33:21 +01:00
parent e5e129a4d0
commit dc662dcaa2
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/ghc/head.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "7.7.20130828"; version = "7.7.20131202";
name = "ghc-${version}"; name = "ghc-${version}";
src = fetchurl { src = fetchurl {
url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2"; url = "http://cryp.to/${name}.tar.xz";
sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv"; sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb";
}; };
buildInputs = [ ghc perl gmp ncurses ]; buildInputs = [ ghc perl gmp ncurses happy alex ];
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/top-level/haskell-defaults.nix
View File

@ -156,6 +156,7 @@
, extraPrefs ? (x : {}) , extraPrefs ? (x : {})
, profExplicit ? false, profDefault ? false , profExplicit ? false, profDefault ? false
, modifyPrio ? lowPrio , modifyPrio ? lowPrio
, extraArgs ? {}
} : } :
import ./haskell-packages.nix { import ./haskell-packages.nix {
inherit pkgs newScope modifyPrio; inherit pkgs newScope modifyPrio;
@ -164,7 +165,7 @@
enableLibraryProfiling = enableLibraryProfiling =
if profExplicit then profDefault if profExplicit then profDefault
else config.cabal.libraryProfiling or profDefault; else config.cabal.libraryProfiling or profDefault;
ghc = callPackage ghcPath { ghc = ghcBinary; }; ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs);
}); });
defaultVersionPrioFun = defaultVersionPrioFun =
@ -331,6 +332,10 @@
packages { ghcPath = ../development/compilers/ghc/head.nix; packages { ghcPath = ../development/compilers/ghc/head.nix;
ghcBinary = ghc742Binary; ghcBinary = ghc742Binary;
prefFun = ghcHEADPrefs; prefFun = ghcHEADPrefs;
extraArgs = {
happy = pkgs.haskellPackages.happy_1_19_2;
alex = pkgs.haskellPackages.alex_3_1_3;
};
}; };
} }