diff options
| author | Peter Simons <simons@cryp.to> | 2013-12-02 21:33:21 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-12-03 22:23:20 +0100 |
| commit | dc662dcaa211361a0ab8db1ad729b16c96e777f3 (patch) | |
| tree | 4f4de5940d112c3934f0220f5509838c38c62c4d /pkgs | |
| parent | e5e129a4d0366f80ddd7cf081b2017bcc8b0bfcd (diff) | |
| download | nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.gz nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.bz2 nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.lz nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.xz nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.zst nixlib-dc662dcaa211361a0ab8db1ad729b16c96e777f3.zip | |
ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 7 |
2 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index e7483700ab0b..f4f8be273679 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, ghc, perl, gmp, ncurses }: +{ stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.7.20130828"; + version = "7.7.20131202"; name = "ghc-${version}"; src = fetchurl { - url = "http://darcs.haskell.org/ghcBuilder/uploads/tn23/${name}-src.tar.bz2"; - sha256 = "180nkd77kz3mv4g7yq8ipx34p5q8k714l0z2527y49lghy118jzv"; + url = "http://cryp.to/${name}.tar.xz"; + sha256 = "1gnp5c3x7dbaz7s2yvkw2fmvqh5by2gpp0zlcyj8p2gv13gxi2cb"; }; - buildInputs = [ ghc perl gmp ncurses ]; + buildInputs = [ ghc perl gmp ncurses happy alex ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 16803155b656..3589be3c6822 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -156,6 +156,7 @@ , extraPrefs ? (x : {}) , profExplicit ? false, profDefault ? false , modifyPrio ? lowPrio + , extraArgs ? {} } : import ./haskell-packages.nix { inherit pkgs newScope modifyPrio; @@ -164,7 +165,7 @@ enableLibraryProfiling = if profExplicit then profDefault else config.cabal.libraryProfiling or profDefault; - ghc = callPackage ghcPath { ghc = ghcBinary; }; + ghc = callPackage ghcPath ({ ghc = ghcBinary; } // extraArgs); }); defaultVersionPrioFun = @@ -331,6 +332,10 @@ packages { ghcPath = ../development/compilers/ghc/head.nix; ghcBinary = ghc742Binary; prefFun = ghcHEADPrefs; + extraArgs = { + happy = pkgs.haskellPackages.happy_1_19_2; + alex = pkgs.haskellPackages.alex_3_1_3; + }; }; } |