diff options
Diffstat (limited to 'pkgs/development/tools/parsing')
15 files changed, 3 insertions, 33 deletions
diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh index 8170bbbea01..ee69b7b6356 100644 --- a/pkgs/development/tools/parsing/asc-support/builder.sh +++ b/pkgs/development/tools/parsing/asc-support/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $ptsupport $toolbuslib $asfsupport" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/asf-support/builder.sh b/pkgs/development/tools/parsing/asf-support/builder.sh index f7e3f7347af..58f73d15f89 100755..100644 --- a/pkgs/development/tools/parsing/asf-support/builder.sh +++ b/pkgs/development/tools/parsing/asf-support/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $ptsupport" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/bison/builder-new.sh b/pkgs/development/tools/parsing/bison/builder-new.sh index 42c191e3544..cff4b60c8e0 100755..100644 --- a/pkgs/development/tools/parsing/bison/builder-new.sh +++ b/pkgs/development/tools/parsing/bison/builder-new.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$m4" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/bison/builder.sh b/pkgs/development/tools/parsing/bison/builder.sh index c112a067c7b..04bd1e2d293 100755..100644 --- a/pkgs/development/tools/parsing/bison/builder.sh +++ b/pkgs/development/tools/parsing/bison/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$m4" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 085b1e0f636..953915729e4 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, m4}: assert m4 != null; -derivation { +stdenv.mkDerivation { name = "bison-1.875"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/bison/bison-1.875.tar.bz2; md5 = "b7f8027b249ebd4dd0cc948943a71af0"; }; - stdenv = stdenv; m4 = m4; } diff --git a/pkgs/development/tools/parsing/flex/builder-new.sh b/pkgs/development/tools/parsing/flex/builder-new.sh index dc78198f37d..55947cd7e8c 100755..100644 --- a/pkgs/development/tools/parsing/flex/builder-new.sh +++ b/pkgs/development/tools/parsing/flex/builder-new.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - export buildinputs="$yacc $m4" . $stdenv/setup diff --git a/pkgs/development/tools/parsing/flex/builder.sh b/pkgs/development/tools/parsing/flex/builder.sh index 4c097580550..e032b031715 100755..100644 --- a/pkgs/development/tools/parsing/flex/builder.sh +++ b/pkgs/development/tools/parsing/flex/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - export buildinputs="$yacc" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 3a4e3649e00..b48a1d8621f 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, yacc}: assert yacc != null; -derivation { +stdenv.mkDerivation { name = "flex-2.5.4a"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/flex/flex-2.5.4a.tar.gz; md5 = "bd8753d0b22e1f4ec87a553a73021adf"; }; - stdenv = stdenv; yacc = yacc; } diff --git a/pkgs/development/tools/parsing/pgen/builder.sh b/pkgs/development/tools/parsing/pgen/builder.sh index c0a41147bae..4c3af02261a 100644 --- a/pkgs/development/tools/parsing/pgen/builder.sh +++ b/pkgs/development/tools/parsing/pgen/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$aterm $getopt $toolbuslib $ptsupport $sdfsupport $asfsupport $ascsupport $sglr" . $stdenv/setup diff --git a/pkgs/development/tools/parsing/pt-support/builder.sh b/pkgs/development/tools/parsing/pt-support/builder.sh index a76e84c4bb4..9c03520e9a2 100755..100644 --- a/pkgs/development/tools/parsing/pt-support/builder.sh +++ b/pkgs/development/tools/parsing/pt-support/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $toolbuslib" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/sdf-support/builder.sh b/pkgs/development/tools/parsing/sdf-support/builder.sh index 258b63002fe..8e0c8537daf 100755..100644 --- a/pkgs/development/tools/parsing/sdf-support/builder.sh +++ b/pkgs/development/tools/parsing/sdf-support/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $ptsupport $toolbuslib" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/sdf2/builder.sh b/pkgs/development/tools/parsing/sdf2/builder.sh index f12e8ca548a..ccba6298838 100755..100644 --- a/pkgs/development/tools/parsing/sdf2/builder.sh +++ b/pkgs/development/tools/parsing/sdf2/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$aterm $getopt" . $stdenv/setup diff --git a/pkgs/development/tools/parsing/sdf2/default.nix b/pkgs/development/tools/parsing/sdf2/default.nix index b5fa9d64bff..93f5944f97d 100644 --- a/pkgs/development/tools/parsing/sdf2/default.nix +++ b/pkgs/development/tools/parsing/sdf2/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, aterm, getopt}: -derivation { +stdenv.mkDerivation { name = "sdf2-1.6"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.stratego-language.org/pub/stratego/sdf2/sdf2-bundle-1.6.tar.gz; md5 = "283be0b4c7c9575c1b5cc735316e6192"; }; - stdenv = stdenv; aterm = aterm; getopt = getopt; } diff --git a/pkgs/development/tools/parsing/sglr/builder.sh b/pkgs/development/tools/parsing/sglr/builder.sh index 1b0d2d35a1a..4898bdad8d4 100755..100644 --- a/pkgs/development/tools/parsing/sglr/builder.sh +++ b/pkgs/development/tools/parsing/sglr/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm $ptsupport $toolbuslib" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/parsing/toolbuslib/builder.sh b/pkgs/development/tools/parsing/toolbuslib/builder.sh index bb5e4dc0c3a..5a224b5498f 100755..100644 --- a/pkgs/development/tools/parsing/toolbuslib/builder.sh +++ b/pkgs/development/tools/parsing/toolbuslib/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$aterm" . $stdenv/setup || exit 1 |