From 6315d6d923a7e92ea40cef2487742f234507dcb8 Mon Sep 17 00:00:00 2001
From: Martin Bravenboer <martin.bravenboer@logicblox.com>
Date: Sat, 3 Jul 2004 10:47:58 +0000
Subject: [PATCH] New version of ATerm library and SDF packages

svn path=/nixpkgs/trunk/; revision=1127
---
 pkgs/development/libraries/aterm/default.nix  |  6 +--
 .../parsing/asc-support/asc-support-2.0.nix   | 12 ++++++
 .../parsing/asf-library/asf-library-1.1.nix   | 10 +++++
 .../parsing/asf-support/asf-support-1.4.nix   | 12 ++++++
 .../error-support/error-support-0.1.1.nix     | 12 ++++++
 .../tools/parsing/pgen/pgen-2.2.nix           | 13 ++++++
 .../parsing/pt-support/pt-support-1.2.nix     | 12 ++++++
 .../parsing/sdf-support/sdf-support-2.1.1.nix | 12 ++++++
 .../tools/parsing/sdf2/bundle-2.2.nix         | 40 +++++++++++++++++++
 .../tools/parsing/sglr/sglr-3.12.nix          | 12 ++++++
 pkgs/system/all-packages-generic.nix          |  6 ++-
 11 files changed, 143 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
 create mode 100644 pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
 create mode 100644 pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
 create mode 100644 pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
 create mode 100644 pkgs/development/tools/parsing/pgen/pgen-2.2.nix
 create mode 100644 pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
 create mode 100644 pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
 create mode 100644 pkgs/development/tools/parsing/sdf2/bundle-2.2.nix
 create mode 100644 pkgs/development/tools/parsing/sglr/sglr-3.12.nix

diff --git a/pkgs/development/libraries/aterm/default.nix b/pkgs/development/libraries/aterm/default.nix
index 1e1324017422..e85c4077b8f0 100644
--- a/pkgs/development/libraries/aterm/default.nix
+++ b/pkgs/development/libraries/aterm/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "aterm-2.1";
+  name = "aterm-2.2";
   configureFlags = "--with-gcc";
   src = fetchurl {
-    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.1.tar.gz;
-    md5 = "b9d541da35b6d287af1cd8460963a7a8";
+    url = http://www.cwi.nl/projects/MetaEnv/aterm/aterm-2.2.tar.gz;
+    md5 = "e1098f4cb84dbfce095cb4c14303ec16";
   };
 }
diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
new file mode 100644
index 000000000000..9559bf75d7af
--- /dev/null
+++ b/pkgs/development/tools/parsing/asc-support/asc-support-2.0.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport, errorsupport, sglr}:
+
+stdenv.mkDerivation {
+  name = "asc-support-2.0";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-2.0.tar.gz;
+    md5 = "34368ca79e524157bf6e89281371cb5a";
+  };
+  inherit stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr;
+  buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport errorsupport sglr];
+}
diff --git a/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
new file mode 100644
index 000000000000..5722012b89c9
--- /dev/null
+++ b/pkgs/development/tools/parsing/asf-library/asf-library-1.1.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "asf-library-1.1";
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/asf-library/asf-library-1.1.tar.gz;
+    md5 = "09b2ccbd115434cedb180e5575d0fa98";
+  };
+}
+
diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
new file mode 100644
index 000000000000..5cfea08dbf79
--- /dev/null
+++ b/pkgs/development/tools/parsing/asf-support/asf-support-1.4.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, ptsupport, errorsupport}:
+
+stdenv.mkDerivation {
+  name = "asf-support-1.4";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.4.tar.gz;
+    md5 = "520ea7d73094346d3010187f22927870";
+  };
+  inherit stdenv aterm ptsupport errorsupport;
+  buildInputs = [stdenv aterm ptsupport errorsupport];
+}
diff --git a/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
new file mode 100644
index 000000000000..fb24c55a2b96
--- /dev/null
+++ b/pkgs/development/tools/parsing/error-support/error-support-0.1.1.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib}: 
+
+stdenv.mkDerivation {
+  name = "error-support-0.1.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/error-support/error-support-0.1.1.tar.gz;
+    md5 = "ebd0965e29ee22508a189477b1dae12b";
+  };
+  inherit aterm toolbuslib;
+  buildInputs = [aterm toolbuslib];
+}
diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.2.nix b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
new file mode 100644
index 000000000000..731b981b1a3a
--- /dev/null
+++ b/pkgs/development/tools/parsing/pgen/pgen-2.2.nix
@@ -0,0 +1,13 @@
+{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, errorsupport, sglr}:
+
+stdenv.mkDerivation {
+  name = "pgen-2.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.2.tar.gz;
+    md5 = "e23323a96d7b1f72a0e10673fa93ef7c";
+  };
+  inherit        aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
+  buildInputs = [aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr];
+  propagatedBuildInputs = [getopt];
+}
diff --git a/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
new file mode 100644
index 000000000000..fb7de5d38442
--- /dev/null
+++ b/pkgs/development/tools/parsing/pt-support/pt-support-1.2.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib, errorsupport}: 
+
+stdenv.mkDerivation {
+  name = "pt-support-1.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/pt-support/pt-support-1.2.tar.gz;
+    md5 = "2ba2fa388130b11b9b91970ebe20c1c7";
+  };
+  inherit aterm toolbuslib errorsupport;
+  buildInputs = [aterm toolbuslib errorsupport];
+}
diff --git a/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
new file mode 100644
index 000000000000..5a2eb7bcfea7
--- /dev/null
+++ b/pkgs/development/tools/parsing/sdf-support/sdf-support-2.1.1.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
+
+stdenv.mkDerivation {
+  name = "sdf-support-2.1.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/sdf-support/sdf-support-2.1.1.tar.gz;
+    md5 = "28b2c044ee711d6c5f22772b7dfafb76";
+  };
+  inherit stdenv aterm ptsupport toolbuslib errorsupport;
+  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
+}
diff --git a/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix b/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix
new file mode 100644
index 000000000000..29ac033a4e58
--- /dev/null
+++ b/pkgs/development/tools/parsing/sdf2/bundle-2.2.nix
@@ -0,0 +1,40 @@
+{stdenv, fetchurl, getopt, aterm}:
+
+rec {
+
+  errorsupport = (import ../error-support/error-support-0.1.1.nix) {
+    inherit fetchurl stdenv aterm toolbuslib;
+  };
+
+  toolbuslib = (import ../toolbuslib/toolbuslib-0.6.nix) {
+    inherit fetchurl stdenv aterm;
+  };
+
+  ptsupport = (import ../pt-support/pt-support-1.2.nix) {
+    inherit fetchurl stdenv aterm toolbuslib errorsupport;
+  };
+
+  asfsupport = (import ../asf-support/asf-support-1.4.nix) {
+    inherit fetchurl stdenv aterm ptsupport errorsupport;
+  };
+
+  sdfsupport = (import ../sdf-support/sdf-support-2.1.1.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport;
+  };
+
+  sglr = (import ../sglr/sglr-3.12.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport errorsupport;
+  };
+
+  ascsupport = (import ../asc-support/asc-support-2.0.nix) {
+    inherit fetchurl stdenv aterm toolbuslib ptsupport asfsupport errorsupport sglr;
+  };
+
+  pgen = (import ../pgen/pgen-2.2.nix) {
+    inherit fetchurl stdenv getopt aterm toolbuslib ptsupport sdfsupport asfsupport ascsupport errorsupport sglr;
+  };
+
+  asflibrary = (import ../asf-library/asf-library-1.1.nix) {
+    inherit fetchurl stdenv;
+  };
+}
diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.12.nix b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
new file mode 100644
index 000000000000..0ecfa5d42db3
--- /dev/null
+++ b/pkgs/development/tools/parsing/sglr/sglr-3.12.nix
@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
+
+stdenv.mkDerivation {
+  name = "sglr-3.12";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.12.tar.gz;
+    md5 = "053753e419adfc337c4776412e3787ab";
+  };
+  inherit stdenv aterm ptsupport toolbuslib errorsupport;
+  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
+}
diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix
index add49a498791..39a2c491bb7b 100644
--- a/pkgs/system/all-packages-generic.nix
+++ b/pkgs/system/all-packages-generic.nix
@@ -258,7 +258,7 @@ rec {
 
   strategoxtdailydist = (import ../development/compilers/strategoxt/dailydist.nix) {
     inherit fetchurl stdenv aterm;
-    sdf = sdf_21;
+    sdf = sdf_22;
   };
 
   tiger = (import ../development/compilers/tiger) {
@@ -324,6 +324,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  sdf_22 = (import ../development/tools/parsing/sdf2/bundle-2.2.nix) {
+    inherit fetchurl stdenv getopt aterm;
+  };
+
   sdf_21 = (import ../development/tools/parsing/sdf2/bundle-2.1.nix) {
     inherit fetchurl stdenv getopt aterm;
   };