diff --git a/pkgs/development/compilers/strategoxt/utils/default.nix b/pkgs/development/compilers/strategoxt/utils/default.nix index 9e67916cf86c..fabe0de9cb90 100644 --- a/pkgs/development/compilers/strategoxt/utils/default.nix +++ b/pkgs/development/compilers/strategoxt/utils/default.nix @@ -1,2 +1,2 @@ -import ./strategoxt-utils-0.14.nix +import ./strategoxt-utils-0.16.nix diff --git a/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix b/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix new file mode 100644 index 000000000000..fa4aac54ba69 --- /dev/null +++ b/pkgs/development/compilers/strategoxt/utils/strategoxt-utils-0.16.nix @@ -0,0 +1,12 @@ +{stdenv, fetchurl, aterm, sdf, strategoxt, pkgconfig}: + +stdenv.mkDerivation { + name = "strategoxt-utils-0.16"; + src = fetchurl { + url = http://nix.cs.uu.nl/dist/stratego/strategoxt-utils-0.16/strategoxt-utils-0.16.tar.gz; + md5 = "a118d67e7a2f1eb61f0cfccbe61aa509"; + }; + + inherit aterm sdf; + buildInputs = [pkgconfig aterm sdf strategoxt]; +} diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index 41166c6c860e..e57cbed3db9f 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -552,11 +552,7 @@ rec { }; strategoxtUtils = (import ../development/compilers/strategoxt/utils) { - inherit fetchurl pkgconfig stdenv sdf strategoxt; - - aterm = (import ../development/libraries/aterm/aterm-2.3.1.nix) { - inherit fetchurl stdenv; - }; + inherit fetchurl pkgconfig stdenv aterm sdf strategoxt; }; bibtextools = (import ../tools/typesetting/bibtex-tools) {