ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

The EHC compiler is now called UHC.

Browse Source 
svn path=/nixpkgs/trunk/; revision=30841
This commit is contained in:
Peter Simons 2011-12-11 19:54:40 +00:00
parent 9dab7db8a2
commit f06abc04c5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/ehc/default.nix → pkgs/development/compilers/uhc/default.nix
View File

@ -6,10 +6,10 @@ let
revision = "2375"; revision = "2375";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ehc-svn-${revision}"; name = "uhc-svn-${revision}";
src = fetchsvn { src = fetchsvn {
url = https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC; url = "https://subversion.cs.uu.nl/repos/project.UHC.pub/trunk/EHC";
rev = revision; rev = revision;
sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619"; sha256 = "bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619";
}; };
@ -17,14 +17,15 @@ stdenv.mkDerivation {
propagatedBuildInputs = [mtl network binary fgl syb]; propagatedBuildInputs = [mtl network binary fgl syb];
buildInputs = [coreutils m4 ghc libtool uulib uuagc]; buildInputs = [coreutils m4 ghc libtool uulib uuagc];
# Can we rename this flag to "--with-cpp-uhc-options"?
configureFlags = "--with-cpp-ehc-options=-I${glibc}/include"; configureFlags = "--with-cpp-ehc-options=-I${glibc}/include";
# EHC builds packages during compilation; these are by default # UHC builds packages during compilation; these are by default
# installed in the user-specific package config file. We do not # installed in the user-specific package config file. We do not
# want that, and hack the build process to use a temporary package # want that, and hack the build process to use a temporary package
# configuration file instead. # configuration file instead.
preConfigure = '' preConfigure = ''
p=`pwd`/ehc-local-packages p=`pwd`/uhc-local-packages
echo '[]' > $p echo '[]' > $p
sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in sed -i "s|--user|--package-db=$p|g" mk/shared.mk.in
sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in sed -i "s|-fglasgow-exts|-fglasgow-exts -package-conf=$p|g" mk/shared.mk.in
@ -32,8 +33,8 @@ stdenv.mkDerivation {
''; '';
meta = { meta = {
homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome"; homepage = "http://www.cs.uu.nl/wiki/UHC";
description = "Essential Haskell Compiler"; description = "Utrecht Haskell Compiler";
platforms = stdenv.lib.platforms.linux; platforms = stdenv.lib.platforms.linux;
maintainers = [ maintainers = [
stdenv.lib.maintainers.andres stdenv.lib.maintainers.andres

2
pkgs/top-level/haskell-packages.nix
View File

@ -1376,7 +1376,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
AgdaExecutable = callPackage ../development/compilers/Agda-executable {}; AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
ehc = callPackage ../development/compilers/ehc {}; uhc = callPackage ../development/compilers/uhc {};
epic = callPackage ../development/compilers/epic {}; epic = callPackage ../development/compilers/epic {};