diff options
Diffstat (limited to 'pkgs/development/tools')
42 files changed, 19 insertions, 100 deletions
diff --git a/pkgs/development/tools/build-managers/apache-ant/builder.sh b/pkgs/development/tools/build-managers/apache-ant/builder.sh index 4478233712bf9..e3e8e63d73d92 100755..100644 --- a/pkgs/development/tools/build-managers/apache-ant/builder.sh +++ b/pkgs/development/tools/build-managers/apache-ant/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfj $src || exit 1 diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix index 52b5f9b524ba0..e7c587136a7a4 100644 --- a/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl, j2sdk}: derivation { +{stdenv, fetchurl, j2sdk}: stdenv.mkDerivation { name = "apache-ant-1.6.0"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://dist.apache.easynet.nl/ant/binaries/apache-ant-1.6.0-bin.tar.bz2; md5 = "01989c306da53862c101d9ea4ebb1f00"; }; - stdenv = stdenv; } diff --git a/pkgs/development/tools/build-managers/gnumake/builder.sh b/pkgs/development/tools/build-managers/gnumake/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/development/tools/build-managers/gnumake/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/development/tools/build-managers/gnumake/default.nix b/pkgs/development/tools/build-managers/gnumake/default.nix index de0bd9c901d45..0b7a044f258e9 100644 --- a/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,14 +1,11 @@ {stdenv, fetchurl, patch}: -derivation { +stdenv.mkDerivation { name = "gnumake-3.80"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/make/make-3.80.tar.bz2; md5 = "0bbd1df101bc0294d440471e50feca71"; }; patches = [./log.diff]; buildInputs = [patch]; - inherit stdenv; } diff --git a/pkgs/development/tools/misc/autoconf/builder.sh b/pkgs/development/tools/misc/autoconf/builder.sh index e421c69a6c27e..de4db475aaac9 100755..100644 --- a/pkgs/development/tools/misc/autoconf/builder.sh +++ b/pkgs/development/tools/misc/autoconf/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$m4 $perl" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/misc/autoconf/default.nix b/pkgs/development/tools/misc/autoconf/default.nix index f7ea5d44c5763..c850d1fb8fecb 100644 --- a/pkgs/development/tools/misc/autoconf/default.nix +++ b/pkgs/development/tools/misc/autoconf/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, m4, perl}: -derivation { +stdenv.mkDerivation { name = "autoconf-2.58"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/autoconf/autoconf-2.58.tar.bz2; md5 = "db3fa3069c6554b3505799c7e1022e2b"; }; - stdenv = stdenv; m4 = m4; perl = perl; } diff --git a/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh index 34bdbcb35b76b..34bdbcb35b76b 100755..100644 --- a/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh +++ b/pkgs/development/tools/misc/autoconf/libtoolbuilder.sh diff --git a/pkgs/development/tools/misc/automake/builder.sh b/pkgs/development/tools/misc/automake/builder.sh index b356da4236515..6610efa72052b 100755..100644 --- a/pkgs/development/tools/misc/automake/builder.sh +++ b/pkgs/development/tools/misc/automake/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $autoconf" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/misc/automake/default.nix b/pkgs/development/tools/misc/automake/default.nix index 219ed9c89e202..3daa1708d4f5d 100644 --- a/pkgs/development/tools/misc/automake/default.nix +++ b/pkgs/development/tools/misc/automake/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, perl, autoconf}: -derivation { +stdenv.mkDerivation { name = "automake-1.7.9"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/automake/automake-1.7.9.tar.bz2; md5 = "571fd0b0598eb2a27dcf68adcfddfacb"; }; - stdenv = stdenv; perl = perl; autoconf = autoconf; } diff --git a/pkgs/development/tools/misc/binutils/builder.sh b/pkgs/development/tools/misc/binutils/builder.sh index 409cd4bba8c46..ac8b7f13a790d 100755..100644 --- a/pkgs/development/tools/misc/binutils/builder.sh +++ b/pkgs/development/tools/misc/binutils/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - . $stdenv/setup patchConfigure() { diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 5208abef63798..014eb72dd9293 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -1,12 +1,11 @@ {stdenv, fetchurl, noSysDirs}: -derivation { +stdenv.mkDerivation { name = "binutils-2.14"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nl.net/pub/gnu/binutils/binutils-2.14.tar.bz2; md5 = "2da8def15d28af3ec6af0982709ae90a"; }; - inherit stdenv noSysDirs; + inherit noSysDirs; } diff --git a/pkgs/development/tools/misc/gnum4/builder.sh b/pkgs/development/tools/misc/gnum4/builder.sh index 03f201582bb7d..de2631e715671 100755..100644 --- a/pkgs/development/tools/misc/gnum4/builder.sh +++ b/pkgs/development/tools/misc/gnum4/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index 25d095d387a06..408c97a3563d6 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -1,11 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gnum4-1.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/m4/m4-1.4.tar.gz; md5 = "9eb2dd07740b2d2f3c7adb3e8d299bda"; }; - stdenv = stdenv; } diff --git a/pkgs/development/tools/misc/gperf/builder.sh b/pkgs/development/tools/misc/gperf/builder.sh index 8eee4233a9451..08e18c2681d46 100755..100644 --- a/pkgs/development/tools/misc/gperf/builder.sh +++ b/pkgs/development/tools/misc/gperf/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - . $stdenv/setup tar xvfz $src diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index cc0f3e317d69b..ded80edca8371 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gperf-2.7.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnu.org/gnu/gperf/gperf-2.7.2.tar.gz; md5 = "e501acc2e18eed2c8f25ca0ac2330d68"; }; - inherit stdenv; } diff --git a/pkgs/development/tools/misc/libtool/builder.sh b/pkgs/development/tools/misc/libtool/builder.sh index eaa673874ae50..4b8407fb533ec 100755..100644 --- a/pkgs/development/tools/misc/libtool/builder.sh +++ b/pkgs/development/tools/misc/libtool/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$m4 $perl" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index febe579a7c73d..e02658af93a09 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl, m4, perl}: -derivation { +stdenv.mkDerivation { name = "libtool-1.5"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnu.org/gnu/libtool/libtool-1.5.tar.gz; md5 = "0e1844f25e2ad74c3715b5776d017545"; }; - stdenv = stdenv; m4 = m4; perl = perl; } diff --git a/pkgs/development/tools/misc/octavefront/builder.sh b/pkgs/development/tools/misc/octavefront/builder.sh index c24c9d1b123d8..16f41eacdc1f0 100755..100644 --- a/pkgs/development/tools/misc/octavefront/builder.sh +++ b/pkgs/development/tools/misc/octavefront/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - set -x buildinputs="$autoconf $g77 $texinfo $bison $flex $gperf $rna $aterm" diff --git a/pkgs/development/tools/misc/octavefront/default.nix b/pkgs/development/tools/misc/octavefront/default.nix index 7fdc5b93c72ca..f68b9bb121848 100644 --- a/pkgs/development/tools/misc/octavefront/default.nix +++ b/pkgs/development/tools/misc/octavefront/default.nix @@ -7,13 +7,12 @@ assert autoconf != null && texinfo != null && rna != null && aterm != null; assert g77.langF77; -derivation { +stdenv.mkDerivation { name = "octavefront-0.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.radionetworkprocessor.com/pub/radionetworkprocessor/octavefront-0.2.tar.gz; md5 = "14e02d060fd6afc6752dbba0a7445ff2"; }; - inherit stdenv autoconf g77 texinfo bison flex gperf rna aterm; + inherit autoconf g77 texinfo bison flex gperf rna aterm; } diff --git a/pkgs/development/tools/misc/pkgconfig/builder.sh b/pkgs/development/tools/misc/pkgconfig/builder.sh index b2b351301626f..c48fd9dbeb1e6 100755..100644 --- a/pkgs/development/tools/misc/pkgconfig/builder.sh +++ b/pkgs/development/tools/misc/pkgconfig/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup tar xvfz $src diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix index 4cd880aad0069..0dae1094666af 100644 --- a/pkgs/development/tools/misc/pkgconfig/default.nix +++ b/pkgs/development/tools/misc/pkgconfig/default.nix @@ -1,13 +1,11 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "pkgconfig-0.15.0"; - system = stdenv.system; builder = ./builder.sh; setupHook = ./setup-hook.sh; src = fetchurl { url = http://www.freedesktop.org/software/pkgconfig/releases/pkgconfig-0.15.0.tar.gz; md5 = "a7e4f60a6657dbc434334deb594cc242"; }; - inherit stdenv; } diff --git a/pkgs/development/tools/misc/swig/builder.sh b/pkgs/development/tools/misc/swig/builder.sh index 25a5040e45d64..10d96cbea53ca 100755..100644 --- a/pkgs/development/tools/misc/swig/builder.sh +++ b/pkgs/development/tools/misc/swig/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - buildinputs="$perl $python" . $stdenv/setup || exit 1 diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index a84ad4fc1f350..d0dd0a8cd3d74 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -4,9 +4,8 @@ assert perlSupport -> perl != null; assert pythonSupport -> python != null; -derivation { +stdenv.mkDerivation { name = "swig-1.3.19"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { @@ -17,7 +16,6 @@ derivation { perlSupport = perlSupport; pythonSupport = pythonSupport; - stdenv = stdenv; perl = if perlSupport then perl else null; python = if pythonSupport then python else null; } \ No newline at end of file diff --git a/pkgs/development/tools/misc/texinfo/builder.sh b/pkgs/development/tools/misc/texinfo/builder.sh index 81a30f02d8a02..0a24647bf81c6 100755..100644 --- a/pkgs/development/tools/misc/texinfo/builder.sh +++ b/pkgs/development/tools/misc/texinfo/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$ncurses" . $stdenv/setup diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix index 960bb6107f8f7..d97f8ffbbe1ce 100644 --- a/pkgs/development/tools/misc/texinfo/default.nix +++ b/pkgs/development/tools/misc/texinfo/default.nix @@ -2,13 +2,12 @@ assert ncurses != null; -derivation { +stdenv.mkDerivation { name = "texinfo-4.6"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnu.org/gnu/texinfo/texinfo-4.6.tar.gz; md5 = "5730c8c0c7484494cca7a7e2d7459c64"; }; - inherit stdenv ncurses; + inherit ncurses; } diff --git a/pkgs/development/tools/misc/valgrind/builder.sh b/pkgs/development/tools/misc/valgrind/builder.sh index ec568b79a183c..a3066cf635266 100755..100644 --- a/pkgs/development/tools/misc/valgrind/builder.sh +++ b/pkgs/development/tools/misc/valgrind/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 # !!! hack; this is because $linuxHeaders/config.h includes some diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix index 772479d601fef..7b46fc183a61e 100644 --- a/pkgs/development/tools/misc/valgrind/default.nix +++ b/pkgs/development/tools/misc/valgrind/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "valgrind-2.1.0"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://developer.kde.org/~sewardj/valgrind-2.1.0.tar.bz2; md5 = "3e4056dd45163a5f555a23ced2f95191"; }; - stdenv = stdenv; } diff --git a/pkgs/development/tools/parsing/asc-support/builder.sh b/pkgs/development/tools/parsing/asc-support/builder.sh index 8170bbbea018b..ee69b7b635601 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 f7e3f7347af9a..58f73d15f8994 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 42c191e3544e4..cff4b60c8e0c3 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 c112a067c7b9a..04bd1e2d29322 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 085b1e0f63641..953915729e44b 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 dc78198f37dce..55947cd7e8c75 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 4c0975805508c..e032b03171514 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 3a4e3649e002d..b48a1d8621fab 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 c0a41147baef9..4c3af02261a7f 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 a76e84c4bb412..9c03520e9a2c4 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 258b63002fe4f..8e0c8537dafbb 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 f12e8ca548abb..ccba62988381b 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 b5fa9d64bff56..93f5944f97d86 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 1b0d2d35a1a0e..4898bdad8d416 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 bb5e4dc0c3a46..5a224b5498f7f 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 |