diff options
Diffstat (limited to 'pkgs/development/tools/misc')
23 files changed, 14 insertions, 55 deletions
diff --git a/pkgs/development/tools/misc/autoconf/builder.sh b/pkgs/development/tools/misc/autoconf/builder.sh index e421c69a6c2..de4db475aaa 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 f7ea5d44c57..c850d1fb8fe 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 34bdbcb35b7..34bdbcb35b7 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 b356da42365..6610efa7205 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 219ed9c89e2..3daa1708d4f 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 409cd4bba8c..ac8b7f13a79 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 5208abef637..014eb72dd92 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 03f201582bb..de2631e7156 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 25d095d387a..408c97a3563 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 8eee4233a94..08e18c2681d 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 cc0f3e317d6..ded80edca83 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 eaa673874ae..4b8407fb533 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 febe579a7c7..e02658af93a 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 c24c9d1b123..16f41eacdc1 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 7fdc5b93c72..f68b9bb1218 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 b2b35130162..c48fd9dbeb1 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 4cd880aad00..0dae1094666 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 25a5040e45d..10d96cbea53 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 a84ad4fc1f3..d0dd0a8cd3d 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 81a30f02d8a..0a24647bf81 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 960bb6107f8..d97f8ffbbe1 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 ec568b79a18..a3066cf6352 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 772479d601f..7b46fc183a6 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; } |