From 172421635c0d1228e538b6f2e2cb2a5b9225e85f Mon Sep 17 00:00:00 2001 From: Martin Bravenboer Date: Wed, 12 May 2004 16:10:43 +0000 Subject: [PATCH] Upgraded all SDF packages svn path=/nixpkgs/trunk/; revision=1018 --- .../parsing/asc-support/asc-support-1.8.nix | 12 +++++------ .../tools/parsing/asc-support/builder.sh | 10 +++------- .../parsing/asf-support/asf-support-1.2.nix | 10 +++++----- .../tools/parsing/asf-support/builder.sh | 10 ++++------ .../development/tools/parsing/pgen/builder.sh | 20 ++++++++----------- .../tools/parsing/pgen/pgen-2.0.nix | 18 ++++++----------- .../development/tools/parsing/sglr/builder.sh | 10 +++------- .../tools/parsing/sglr/sglr-3.10.2.nix | 11 +++++----- 8 files changed, 39 insertions(+), 62 deletions(-) diff --git a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix b/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix index f25840d2ae8..b12b4af1c86 100644 --- a/pkgs/development/tools/parsing/asc-support/asc-support-1.8.nix +++ b/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; - aterm = aterm; - ptsupport = ptsupport; - toolbuslib = toolbuslib; - asfsupport = asfsupport; + inherit stdenv aterm ptsupport toolbuslib asfsupport; + buildInputs = [stdenv aterm ptsupport toolbuslib asfsupport]; } diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh index ee69b7b6356..6fdc9d90bdf 100644 --- a/pkgs/development/tools/parsing/asc-support/builder.sh +++ b/pkgs/development/tools/parsing/asc-support/builder.sh @@ -1,7 +1,3 @@ -buildinputs="$aterm $ptsupport $toolbuslib $asfsupport" -. $stdenv/setup || exit 1 - -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 +. $stdenv/setup +configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport --with-asf-support=$asfsupport" +genericBuild \ No newline at end of file diff --git a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix b/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix index 1ee9a6d5e2a..eb97ad9cf0e 100644 --- a/pkgs/development/tools/parsing/asf-support/asf-support-1.2.nix +++ b/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; - aterm = aterm; - ptsupport = ptsupport; + inherit stdenv aterm ptsupport; + buildInputs = [stdenv aterm ptsupport]; } diff --git a/pkgs/development/tools/parsing/asf-support/builder.sh b/pkgs/development/tools/parsing/asf-support/builder.sh index 58f73d15f89..8c22ac230ac 100644 --- a/pkgs/development/tools/parsing/asf-support/builder.sh +++ b/pkgs/development/tools/parsing/asf-support/builder.sh @@ -1,7 +1,5 @@ -buildinputs="$aterm $ptsupport" -. $stdenv/setup || exit 1 +. $stdenv/setup +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 diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh index 4c3af02261a..f0653d86e03 100644 --- a/pkgs/development/tools/parsing/pgen/builder.sh +++ b/pkgs/development/tools/parsing/pgen/builder.sh @@ -1,16 +1,12 @@ -buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr" . $stdenv/setup - -tar zxf $src -cd pgen-* -./configure --prefix=$out --with-aterm=$aterm \ - --with-toolbuslib=$toolbuslib \ - --with-pt-support=$ptsupport \ - --with-sdf-support=$sdfsupport \ - --with-asf-support=$asfsupport \ - --with-asc-support=$asfsupport \ - --with-sglr=$sglr -make install +configureFlags="--with-aterm=$aterm \ + --with-toolbuslib=$toolbuslib \ + --with-pt-support=$ptsupport \ + --with-sdf-support=$sdfsupport \ + --with-asf-support=$asfsupport \ + --with-asc-support=$asfsupport \ + --with-sglr=$sglr" +genericBuild mkdir $out/nix-support echo "$getopt" > $out/nix-support/propagated-build-inputs diff --git a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix b/pkgs/development/tools/parsing/pgen/pgen-2.0.nix index 08b6aa78bc8..624f588ceb4 100644 --- a/pkgs/development/tools/parsing/pgen/pgen-2.0.nix +++ b/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; - aterm = aterm; - getopt = getopt; - toolbuslib = toolbuslib; - ptsupport = ptsupport; - sdfsupport = sdfsupport; - asfsupport = asfsupport; - ascsupport = ascsupport; - sglr = sglr; -} \ No newline at end of file + inherit stdenv aterm getopt toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr; + buildInputs = [stdenv aterm getopt toolbuslib ptsupport sdfsupport asfsupport ascsupport sglr]; +} diff --git a/pkgs/development/tools/parsing/sglr/builder.sh b/pkgs/development/tools/parsing/sglr/builder.sh index 4898bdad8d4..b366ccb7909 100644 --- a/pkgs/development/tools/parsing/sglr/builder.sh +++ b/pkgs/development/tools/parsing/sglr/builder.sh @@ -1,7 +1,3 @@ -buildinputs="$aterm $ptsupport $toolbuslib" -. $stdenv/setup || exit 1 - -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 +. $stdenv/setup +configureFlags="--with-aterm=$aterm --with-toolbuslib=$toolbuslib --with-pt-support=$ptsupport" +genericBuild diff --git a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix b/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix index fdce971e8de..5a464ad40e5 100644 --- a/pkgs/development/tools/parsing/sglr/sglr-3.10.2.nix +++ b/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; - aterm = aterm; - ptsupport = ptsupport; - toolbuslib = toolbuslib; + inherit stdenv aterm ptsupport toolbuslib; + buildInputs = [stdenv aterm ptsupport toolbuslib]; }