diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index f30be007fa5..88e31d08515 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -2,10 +2,14 @@ stdenv.mkDerivation { name = "aterm-2.5"; + src = fetchurl { url = http://buildfarm.st.ewi.tudelft.nl/releases/meta-environment/aterm-2.5pre21238-l2q7rg38/aterm-2.5.tar.gz; md5 = "33ddcb1a229baf406ad1f603eb1d5995"; }; + + doCheck = true; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; diff --git a/pkgs/development/libraries/aterm/2.7.nix b/pkgs/development/libraries/aterm/2.7.nix new file mode 100644 index 00000000000..b5065949410 --- /dev/null +++ b/pkgs/development/libraries/aterm/2.7.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "aterm-2.7"; + + src = fetchurl { + url = http://homepages.cwi.nl/~daybuild/releases//aterm-2.7.tar.gz; + sha256 = "0zhs0rncn4iankr70kbms64dwxm9i0956gs02dbw7ylx4mln8ynn"; + }; + + #doCheck = true; + + CFLAGS = "-O0"; + + meta = { + homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; + license = "LGPL"; + description = "Library for manipulation of term data structures in C"; + }; +} diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix deleted file mode 100644 index 9f0c09c4d2d..00000000000 --- a/pkgs/development/libraries/aterm/default.nix +++ /dev/null @@ -1 +0,0 @@ -import ./2.4.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8613fbb5e9c..e687d8ed3f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1857,13 +1857,13 @@ let transformers = import ../development/compilers/transformers { inherit fetchurl pkgconfig sdf; - aterm = aterm23x; + aterm = aterm23; stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; strategoxt = import ../development/compilers/strategoxt/strategoxt-0.14.nix { inherit fetchurl pkgconfig sdf; - aterm = aterm23x; + aterm = aterm23; stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34; }; @@ -2515,7 +2515,13 @@ let inherit fetchurl stdenv aspell which; }); - aterm = lowPrio (import ../development/libraries/aterm { + aterm = aterm24; + + aterm23 = import ../development/libraries/aterm/2.3.nix { + inherit fetchurl stdenv; + }; + + aterm24 = lowPrio (import ../development/libraries/aterm/2.4.nix { inherit fetchurl stdenv; }); @@ -2523,14 +2529,14 @@ let inherit fetchurl stdenv; }; - aterm23x = import ../development/libraries/aterm/2.3.nix { - inherit fetchurl stdenv; - }; - aterm25 = import ../development/libraries/aterm/2.5.nix { inherit fetchurl stdenv; }; + aterm27 = lowPrio (import ../development/libraries/aterm/2.7.nix { + inherit fetchurl stdenv; + }); + attr = useFromStdenv "attr" (import ../development/libraries/attr { inherit stdenv fetchurl gettext;