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/top-level | |
| parent | e5e129a4d0366f80ddd7cf081b2017bcc8b0bfcd (diff) | |
| download | nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.gz nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.bz2 nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.lz nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.xz nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.tar.zst nixpkgs-dc662dcaa211361a0ab8db1ad729b16c96e777f3.zip | |
ghc-head: update to today's git snapshot and arbitrarily dub it version 7.7.20131202
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 16803155b65..3589be3c682 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; + }; }; } |