Author: simons
Date: Sun Dec 11 19:54:40 2011
New Revision: 30841
URL: https://nixos.org/websvn/nix/?rev=30841&sc=1
Log:
The EHC compiler is now called UHC.
Added:
nixpkgs/trunk/pkgs/development/compilers/uhc/
nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
- copied, changed from r30840,
nixpkgs/trunk/pkgs/development/compilers/ehc/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/compilers/ehc/
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Copied and modified: nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix
(from r30840, nixpkgs/trunk/pkgs/development/compilers/ehc/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/compilers/ehc/default.nix Sun Dec 11
19:39:16 2011 (r30840, copy source)
+++ nixpkgs/trunk/pkgs/development/compilers/uhc/default.nix Sun Dec 11
19:54:40 2011 (r30841)
@@ -6,10 +6,10 @@
revision = "2375";
in
stdenv.mkDerivation {
- name = "ehc-svn-${revision}";
+ name = "uhc-svn-${revision}";
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;
sha256 =
"bde79664b7d04337ce668eab63291702687e6d572a302111425e5ff870c57619";
};
@@ -17,14 +17,15 @@
propagatedBuildInputs = [mtl network binary fgl syb];
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";
- # 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
# want that, and hack the build process to use a temporary package
# configuration file instead.
preConfigure = ''
- p=`pwd`/ehc-local-packages
+ p=`pwd`/uhc-local-packages
echo '[]' > $p
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
@@ -32,8 +33,8 @@
'';
meta = {
- homepage = "http://www.cs.uu.nl/wiki/Ehc/WebHome";;
- description = "Essential Haskell Compiler";
+ homepage = "http://www.cs.uu.nl/wiki/UHC";;
+ description = "Utrecht Haskell Compiler";
platforms = stdenv.lib.platforms.linux;
maintainers = [
stdenv.lib.maintainers.andres
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Dec 11 19:39:16
2011 (r30840)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Dec 11 19:54:40
2011 (r30841)
@@ -1376,7 +1376,7 @@
AgdaExecutable = callPackage ../development/compilers/Agda-executable {};
- ehc = callPackage ../development/compilers/ehc {};
+ uhc = callPackage ../development/compilers/uhc {};
epic = callPackage ../development/compilers/epic {};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
