Upgraded aterm to aterm 2.4. Removed the dynamic variant.

svn path=/nixpkgs/trunk/; revision=3611
This commit is contained in:
Martin Bravenboer 2005-08-17 14:29:04 +00:00
parent 8c1905ce5b
commit 3ea317784f
6 changed files with 40 additions and 27 deletions

View file

@ -0,0 +1,13 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "aterm-2.3.1";
configureFlags = "--with-gcc";
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
};
patches = [ ./aterm-alias-fix.patch ];
}

View file

@ -0,0 +1,9 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "aterm-2.4";
src = fetchurl {
url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.4.tar.gz;
md5 = "baf12d71372cfaa0d39145234e262fef";
};
}

View file

@ -1,13 +1 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "aterm-2.3.1";
configureFlags = "--with-gcc";
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.1.tar.gz;
md5 = "5a2d70acc45a9d301e0dba12fcaf77e7";
};
patches = [ ./aterm-alias-fix.patch ];
}
import ./aterm-2.4.nix

View file

@ -1,9 +0,0 @@
{stdenv, fetchurl}:
stdenv.mkDerivation {
name = "aterm-dynamic-2.3.2";
src = fetchurl {
url = http://catamaran.labs.cs.uu.nl/dist/tarballs/aterm-2.3.2pre11665.tar.gz;
md5 = "2eb01c044d765ded55f10e05756fec98";
};
}

View file

@ -400,6 +400,23 @@ rec {
inherit stdenv;
};
/*
gcj = (import ../build-support/gcc-wrapper/default2.nix) {
name = "gcj";
nativeTools = false;
nativeGlibc = false;
gcc = (import ../development/compilers/gcc-4.0) {
inherit fetchurl stdenv noSysDirs;
langJava = true;
langCC = false;
langC = false;
langF77 = false;
};
inherit (stdenv.gcc) binutils glibc;
inherit stdenv;
};
*/
opencxx = (import ../development/compilers/opencxx) {
inherit fetchurl stdenv libtool;
gcc = gcc33;
@ -601,10 +618,6 @@ rec {
inherit fetchurl stdenv;
};
atermDynamic = (import ../development/libraries/aterm/dynamic.nix) {
inherit fetchurl stdenv;
};
sdf = (import ../development/tools/parsing/sdf) {
inherit fetchurl stdenv aterm getopt;
};

View file

@ -39,7 +39,6 @@ let {
flexnew
gccWrapped
aterm
atermDynamic
# atermjava
# jjtraveler