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

uhc: convert build to Haskell NG

Browse Source
This commit is contained in:
Peter Simons 2015-04-23 15:21:15 +02:00
parent a186500417
commit 436fbf8564
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/compilers/uhc/default.nix
View File

@ -1,9 +1,6 @@
{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages, { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
shuffle,
hashable, mtl, network, uhc-util, uulib
}:
let wrappedGhc = ghcWithPackages ( self: [hashable mtl network uhc-util uulib] ); let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [shuffle hashable mtl network uhc-util uulib] );
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
version = "1.1.8.10"; version = "1.1.8.10";
name = "uhc-${version}"; name = "uhc-${version}";
@ -16,7 +13,7 @@ in stdenv.mkDerivation rec {
postUnpack = "sourceRoot=\${sourceRoot}/EHC"; postUnpack = "sourceRoot=\${sourceRoot}/EHC";
buildInputs = [ m4 wrappedGhc clang libtool shuffle ]; buildInputs = [ m4 wrappedGhc clang libtool ];
configureFlags = [ "--with-gcc=${clang}/bin/clang" ]; configureFlags = [ "--with-gcc=${clang}/bin/clang" ];

3
pkgs/top-level/all-packages.nix
View File

@ -3749,8 +3749,7 @@ let
uhc = callPackage ../development/compilers/uhc/default.nix ({ uhc = callPackage ../development/compilers/uhc/default.nix ({
stdenv = clangStdenv; stdenv = clangStdenv;
ghcWithPackages = haskellngPackages.ghcWithPackages; inherit (haskellPackages) ghcWithPackages;
inherit (haskellngPackages) shuffle hashable mtl network uhc-util uulib;
}); });
gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded { gcc-arm-embedded-4_7 = callPackage_i686 ../development/compilers/gcc-arm-embedded {