diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/networking/bittorrent/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/bittorrent/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/networking/cksfv/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/cksfv/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/tools/networking/curl/builder.sh | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/curl/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/networking/par2cmdline/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/par2cmdline/default.nix | 4 | ||||
-rwxr-xr-x | pkgs/tools/networking/wget/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/tools/networking/wget/default.nix | 4 |
10 files changed, 7 insertions, 28 deletions
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; } |