jhc: convert build to Haskell NG

This commit is contained in:
Peter Simons 2015-04-23 15:20:34 +02:00
parent 7299118724
commit a186500417
2 changed files with 8 additions and 8 deletions

View File

@ -1,5 +1,9 @@
{ stdenv, fetchurl, perl, ghc, binary, zlib, utf8String, readline, fgl, { stdenv, fetchurl, perl, ghcWithPackages }:
regexCompat, HsSyck, random }:
let ghc = ghcWithPackages (hpkgs: with hpkgs; [
binary zlib utf8-string readline fgl regex-compat HsSyck random
]);
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "jhc-${version}"; name = "jhc-${version}";
@ -10,10 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz"; sha256 = "0lrgg698mx6xlrqcylba9z4g1f053chrzc92ri881dmb1knf83bz";
}; };
buildInputs = buildInputs = [ perl ghc ];
[ perl ghc binary zlib utf8String
readline fgl regexCompat HsSyck random
];
meta = { meta = {
description = "Whole-program, globally optimizing Haskell compiler"; description = "Whole-program, globally optimizing Haskell compiler";

View File

@ -3744,8 +3744,7 @@ let
}; };
jhc = callPackage ../development/compilers/jhc { jhc = callPackage ../development/compilers/jhc {
inherit (haskellPackages_ghc763) ghc binary zlib utf8String readline fgl inherit (haskell.packages.ghc763) ghcWithPackages;
regexCompat HsSyck random;
}; };
uhc = callPackage ../development/compilers/uhc/default.nix ({ uhc = callPackage ../development/compilers/uhc/default.nix ({