Upgraded all SDF packages

svn path=/nixpkgs/trunk/; revision=1018

pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix

@@ -1,14 +1,12 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport}: derivation {
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport, asfsupport}:
+
+stdenv.mkDerivation {
   name = "asc-support-1.8";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.cwi.nl/projects/MetaEnv/asc-support/asc-support-1.8.tar.gz;
     md5 = "e85a790c6004dfb974d79fc9699f69f4";
   };
-  stdenv = stdenv;
+  inherit stdenv aterm ptsupport toolbuslib asfsupport;
-  aterm = aterm;
+  buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport];
-  ptsupport = ptsupport;
-  toolbuslib = toolbuslib;
-  asfsupport = asfsupport;
 }

pkgs/development/tools/parsing/asc-support/builder.sh

@@ -1,7 +1,3 @@
-buildinputs="$aterm $ptsupport $toolbuslib $asfsupport"
+. $stdenv/setup
-. $stdenv/setup || exit 1
+configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport --with-asf-support=$asfsupport"
-
+genericBuild
-tar zxf $src || exit 1
-cd asc-support-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport --with-asf-support=$asfsupport || exit 1
-make install || exit 1

pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix

@@ -1,12 +1,12 @@
-{stdenv, fetchurl, aterm, ptsupport}: derivation {
+{stdenv, fetchurl, aterm, ptsupport}:
+
+stdenv.mkDerivation {
   name = "asf-support-1.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.cwi.nl/projects/MetaEnv/asf-support/asf-support-1.2.tar.gz;
     md5 = "f32de4c97e62486b67e0af4408585980";
   };
-  stdenv = stdenv;
+  inherit stdenv aterm ptsupport;
-  aterm = aterm;
+  buildInputs = [stdenv aterm ptsupport];
-  ptsupport = ptsupport;
 }

pkgs/development/tools/parsing/asf-support/builder.sh

@@ -1,7 +1,5 @@
-buildinputs="$aterm $ptsupport"
+. $stdenv/setup
-. $stdenv/setup || exit 1
+configureFlags="--with-aterm=$aterm --with-pt-support=$ptsupport"
+genericBuild
+
 
-tar zxf $src || exit 1
-cd asf-support-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm --with-pt-support=$ptsupport || exit 1
-make install || exit 1

pkgs/development/tools/parsing/pgen/builder.sh

@@ -1,16 +1,12 @@
-buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr"
 . $stdenv/setup
-
+configureFlags="--with-aterm=$aterm \
-tar zxf $src
+                --with-toolbuslib=$toolbuslib \
-cd pgen-*
+                --with-pt-support=$ptsupport \
-./configure --prefix=$out --with-aterm=$aterm \
+                --with-sdf-support=$sdfsupport \
-                          --with-toolbuslib=$toolbuslib \
+                --with-asf-support=$asfsupport \
-                          --with-pt-support=$ptsupport \
+                --with-asc-support=$asfsupport \
-                          --with-sdf-support=$sdfsupport \
+                --with-sglr=$sglr"
-                          --with-asf-support=$asfsupport \
+genericBuild
-                          --with-asc-support=$asfsupport \
-                          --with-sglr=$sglr 
-make install
 
 mkdir $out/nix-support
 echo "$getopt" > $out/nix-support/propagated-build-inputs

pkgs/development/tools/parsing/pgen/pgen-2.0.nix

@@ -1,18 +1,12 @@
-{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, sglr}: derivation {
+{stdenv, getopt, fetchurl, aterm, toolbuslib, ptsupport, sdfsupport, asfsupport, ascsupport, sglr}:
+
+stdenv.mkDerivation {
   name = "pgen-2.0";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.cwi.nl/projects/MetaEnv/pgen/pgen-2.0.tar.gz;
     md5 = "368cd8abeed29591a35660d8cea79975";
   };
-  stdenv = stdenv;
+  inherit        stdenv aterm getopt toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr;
-  aterm = aterm;
+  buildInputs = [stdenv aterm getopt toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr];
-  getopt = getopt;
+}
-  toolbuslib = toolbuslib;
-  ptsupport = ptsupport;
-  sdfsupport = sdfsupport;
-  asfsupport = asfsupport;
-  ascsupport = ascsupport;
-  sglr = sglr;
-}

pkgs/development/tools/parsing/sglr/builder.sh

@@ -1,7 +1,3 @@
-buildinputs="$aterm $ptsupport $toolbuslib"
+. $stdenv/setup
-. $stdenv/setup || exit 1
+configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport"
-
+genericBuild
-tar zxf $src || exit 1
-cd sglr-* || exit 1
-./configure --prefix=$out --with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport || exit 1
-make install || exit 1

pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix

@@ -1,13 +1,12 @@
-{stdenv, fetchurl, aterm, toolbuslib, ptsupport}: derivation {
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport}:
+
+stdenv.mkDerivation {
   name = "sglr-3.10.2";
-  system = stdenv.system;
   builder = ./builder.sh;
   src = fetchurl {
     url = http://www.cwi.nl/projects/MetaEnv/sglr/sglr-3.10.2.tar.gz;
     md5 = "39aa609be84115d7ddc56a6c74b792b7";
   };
-  stdenv = stdenv;
+  inherit stdenv aterm ptsupport toolbuslib;
-  aterm = aterm;
+  buildInputs = [stdenv aterm ptsupport toolbuslib];
-  ptsupport = ptsupport;
-  toolbuslib = toolbuslib;
 }