diff options
Diffstat (limited to 'pkgs/tools')
42 files changed, 23 insertions, 123 deletions
diff --git a/pkgs/tools/archivers/gnutar/builder.sh b/pkgs/tools/archivers/gnutar/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/archivers/gnutar/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index e5cbf559cf8f5..893c0fb0f4c7f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gnutar-1.13.25"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz; md5 = "6ef8c906e81eee441f8335652670ac4a"; }; - inherit stdenv; } diff --git a/pkgs/tools/archivers/unzip/builder.sh b/pkgs/tools/archivers/unzip/builder.sh index f0b9d031802c7..0166eecce6b73 100755..100644 --- a/pkgs/tools/archivers/unzip/builder.sh +++ b/pkgs/tools/archivers/unzip/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - . $stdenv/setup builder() { diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 8467e00d029df..c871c7755d6e7 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "unzip-5.50"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz; md5 = "798592d62e37f92571184236947122ed"; }; - inherit stdenv; } diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh index b68fdfe32b83c..04fb0ec967f84 100755..100644 --- a/pkgs/tools/archivers/zip/builder.sh +++ b/pkgs/tools/archivers/zip/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 7b4ea02fb4055..d5f8f910a7e8b 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "zip-2.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz; md5 = "5206a99541f3b0ab90f1baa167392c4f"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh index e2c5982852e6d..49028c0e5a1ea 100755..100644 --- a/pkgs/tools/compression/bzip2/builder.sh +++ b/pkgs/tools/compression/bzip2/builder.sh @@ -1,4 +1,3 @@ -#! /bin/sh -e . $stdenv/setup installFlags="PREFIX=$out" genericBuild diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index af3ec46dec79b..afe2a620377e3 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "bzip2-1.0.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://sources.redhat.com/pub/bzip2/v102/bzip2-1.0.2.tar.gz; md5 = "ee76864958d568677f03db8afad92beb"; }; - inherit stdenv; } diff --git a/pkgs/tools/compression/gzip/builder.sh b/pkgs/tools/compression/gzip/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/compression/gzip/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index d766635b05b24..7e324fc91271e 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gzip-1.3.3"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = http://www.gzip.org/gzip-1.3.3.tar.gz; md5 = "52eaf713673507d21f7abefee98ba662"; }; - inherit stdenv; } diff --git a/pkgs/tools/graphics/graphviz/builder.sh b/pkgs/tools/graphics/graphviz/builder.sh index 3fd6c6bb902ac..1926fc3c9d11b 100755..100644 --- a/pkgs/tools/graphics/graphviz/builder.sh +++ b/pkgs/tools/graphics/graphviz/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$x11 $libpng $libjpeg $expat $freetype" . $stdenv/setup diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 9bc51be695a90..c9303bc72a874 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -3,9 +3,8 @@ assert x11 != null && libpng != null && libjpeg != null && expat != null; -derivation { +stdenv.mkDerivation { name = "graphviz-1.10"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { @@ -13,7 +12,6 @@ derivation { md5 = "e1402531abff68d146bf94e72b44dc2a"; }; - stdenv = stdenv; x11 = x11; libpng = libpng; libjpeg = libjpeg; diff --git a/pkgs/tools/misc/coreutils/builder.sh b/pkgs/tools/misc/coreutils/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/misc/coreutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 009ff76ab6722..b69428a0ceb6d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "coreutils-5.0"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/coreutils/coreutils-5.0.tar.bz2; md5 = "94e5558ee2a65723d4840bfde2d323f0"; }; - inherit stdenv; } diff --git a/pkgs/tools/misc/findutils/builder.sh b/pkgs/tools/misc/findutils/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/misc/findutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix index 1aafc99991593..ea20991062965 100644 --- a/pkgs/tools/misc/findutils/default.nix +++ b/pkgs/tools/misc/findutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "findutils-4.1.20"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://alpha.gnu.org/pub/gnu/findutils/findutils-4.1.20.tar.gz; md5 = "e90ce7222daadeb8616b8db461e17cbc"; }; - inherit stdenv; } diff --git a/pkgs/tools/misc/getopt/builder.sh b/pkgs/tools/misc/getopt/builder.sh index 30ac6e3d453dd..b086693baece0 100755..100644 --- a/pkgs/tools/misc/getopt/builder.sh +++ b/pkgs/tools/misc/getopt/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/misc/getopt/default.nix b/pkgs/tools/misc/getopt/default.nix index c34230ddeeef6..1e27204a5afbf 100644 --- a/pkgs/tools/misc/getopt/default.nix +++ b/pkgs/tools/misc/getopt/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "getopt-1.1.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://huizen.dds.nl/~frodol/getopt-1.1.3.tar.gz; md5 = "7b7637dcb0ac531f1af29f4d6b018e86"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/networking/bittorrent/builder.sh b/pkgs/tools/networking/bittorrent/builder.sh index 6530173214134..342bf991bae0e 100755..100644 --- a/pkgs/tools/networking/bittorrent/builder.sh +++ b/pkgs/tools/networking/bittorrent/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - buildinputs="$python $wxPython" . $stdenv/setup diff --git a/pkgs/tools/networking/bittorrent/default.nix b/pkgs/tools/networking/bittorrent/default.nix index feacfbb2ecd72..13711226950bb 100644 --- a/pkgs/tools/networking/bittorrent/default.nix +++ b/pkgs/tools/networking/bittorrent/default.nix @@ -2,14 +2,13 @@ assert wxPython.python.zlibSupport; -derivation { +stdenv.mkDerivation { name = "bittorrent-3.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://bitconjurer.org/BitTorrent/BitTorrent-3.3.tar.gz; md5 = "1ecf1fc40b4972470313f9ae728206e8"; }; python = wxPython.python; - inherit stdenv wxPython; + inherit wxPython; } diff --git a/pkgs/tools/networking/cksfv/builder.sh b/pkgs/tools/networking/cksfv/builder.sh index 1b22f508241b3..18b63b2fd6152 100755..100644 --- a/pkgs/tools/networking/cksfv/builder.sh +++ b/pkgs/tools/networking/cksfv/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/networking/cksfv/default.nix b/pkgs/tools/networking/cksfv/default.nix index 5551831a1d502..643355eb5d2e5 100644 --- a/pkgs/tools/networking/cksfv/default.nix +++ b/pkgs/tools/networking/cksfv/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "cksfv-1.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://www.fodder.org/cksfv/cksfv-1.3.tar.gz; md5 = "e00cf6a80a566539eb6f3432f2282c38"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/networking/curl/builder.sh b/pkgs/tools/networking/curl/builder.sh deleted file mode 100755 index 6e33f41fff567..0000000000000 --- a/pkgs/tools/networking/curl/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -configureFlags="--without-ssl" -genericBuild diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a2e9c273847fd..d7627982d6a58 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, zlib}: -derivation { +stdenv.mkDerivation { name = "curl-7.11.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://curl.haxx.se/download/curl-7.11.1.tar.bz2; md5 = "c2af7c3364a1a8839516f74961b6bd11"; }; buildInputs = [zlib]; - inherit stdenv; + configureFlags = "--without-ssl"; } diff --git a/pkgs/tools/networking/par2cmdline/builder.sh b/pkgs/tools/networking/par2cmdline/builder.sh index 60aac555e1c03..0dbb5e0a57b13 100755..100644 --- a/pkgs/tools/networking/par2cmdline/builder.sh +++ b/pkgs/tools/networking/par2cmdline/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index 488ad88a0d991..3c669d20c686f 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "par2cmdline-0.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://heanet.dl.sourceforge.net/sourceforge/parchive/par2cmdline-0.3.tar.gz; md5 = "705c97bc41b862d281dd41c219a60849"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/networking/wget/builder.sh b/pkgs/tools/networking/wget/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/networking/wget/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b3ec1829421fc..21bf49769083c 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "wget-1.9.1"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nl.net/pub/gnu/wget/wget-1.9.1.tar.gz; md5 = "e6051f1e1487ec0ebfdbda72bedc70ad"; }; - inherit stdenv; } diff --git a/pkgs/tools/system/which/builder.sh b/pkgs/tools/system/which/builder.sh index e6ddd3dfa7380..3c09d5ff13749 100755..100644 --- a/pkgs/tools/system/which/builder.sh +++ b/pkgs/tools/system/which/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix index 8d85e4120fc03..0c9f6b6a7764e 100644 --- a/pkgs/tools/system/which/default.nix +++ b/pkgs/tools/system/which/default.nix @@ -1,12 +1,10 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "which-2.16"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = http://ftp.gnu.org/gnu/which/which-2.16.tar.gz; md5 = "830b83af48347a9a3520f561e47cbc9b"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/text/diffutils/builder.sh b/pkgs/tools/text/diffutils/builder.sh deleted file mode 100755 index 46f69284ae87c..0000000000000 --- a/pkgs/tools/text/diffutils/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix index bcb9a4891b6d9..7fc4fe3d5fb75 100644 --- a/pkgs/tools/text/diffutils/default.nix +++ b/pkgs/tools/text/diffutils/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "diffutils-2.8.1"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/diffutils/diffutils-2.8.1.tar.gz; md5 = "71f9c5ae19b60608f6c7f162da86a428"; }; - inherit stdenv; } diff --git a/pkgs/tools/text/ed/builder.sh b/pkgs/tools/text/ed/builder.sh index ba63de01c9509..0c4430cf2acf3 100755..100644 --- a/pkgs/tools/text/ed/builder.sh +++ b/pkgs/tools/text/ed/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/text/ed/default.nix b/pkgs/tools/text/ed/default.nix index 1f79383e0581a..dbbd944e05ec6 100644 --- a/pkgs/tools/text/ed/default.nix +++ b/pkgs/tools/text/ed/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "ed-0.2"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.gnu.org/pub/gnu/ed/ed-0.2.tar.gz; md5 = "ddd57463774cae9b50e70cd51221281b"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/text/gawk/builder.sh b/pkgs/tools/text/gawk/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/text/gawk/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 26340d74f4dcb..b15f3ffb6e3d0 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gawk-3.1.3"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/gawk/gawk-3.1.3.tar.bz2; md5 = "a116eec17e7ba085febb74c7758823bd"; }; - inherit stdenv; } diff --git a/pkgs/tools/text/gnugrep/builder.sh b/pkgs/tools/text/gnugrep/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/text/gnugrep/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix index f8a2563de6e14..e820cf69eb071 100644 --- a/pkgs/tools/text/gnugrep/default.nix +++ b/pkgs/tools/text/gnugrep/default.nix @@ -1,13 +1,10 @@ {stdenv, fetchurl, pcre}: -derivation { +stdenv.mkDerivation { name = "gnugrep-2.5.1"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/grep/grep-2.5.1.tar.bz2; md5 = "ddd99e2d5d4f4611357e31e97f080cf2"; }; buildInputs = [pcre]; - inherit stdenv; } diff --git a/pkgs/tools/text/gnupatch/builder.sh b/pkgs/tools/text/gnupatch/builder.sh index 0b7210beff44c..0dc0ba871d96e 100755..100644 --- a/pkgs/tools/text/gnupatch/builder.sh +++ b/pkgs/tools/text/gnupatch/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index ddc24e55aee1f..e5e02730e6d6e 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "gnupatch-2.5.4"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/patch/patch-2.5.4.tar.gz; md5 = "ee5ae84d115f051d87fcaaef3b4ae782"; }; - stdenv = stdenv; } diff --git a/pkgs/tools/text/gnused/builder.sh b/pkgs/tools/text/gnused/builder.sh deleted file mode 100755 index 46f69284ae87c..0000000000000 --- a/pkgs/tools/text/gnused/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index bcca43fcec706..fb956e60de757 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gnused-4.0.7"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://ftp.nluug.nl/pub/gnu/sed/sed-4.0.7.tar.gz; md5 = "005738e7f97bd77d95b6907156c8202a"; }; - inherit stdenv; } |