diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/bsd-finger/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/networking/iodine/default.nix | 23 | ||||
-rw-r--r-- | pkgs/tools/networking/iodine/iodine-0.4.1.nix | 21 | ||||
-rw-r--r-- | pkgs/tools/networking/iperf/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/libtorrent/default.nix | 7 | ||||
-rw-r--r-- | pkgs/tools/networking/p2p/rtorrent/default.nix | 8 | ||||
-rw-r--r-- | pkgs/tools/networking/stun/default.nix | 10 |
7 files changed, 52 insertions, 47 deletions
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix index d627235494b..fc29af989ce 100644 --- a/pkgs/tools/networking/bsd-finger/default.nix +++ b/pkgs/tools/networking/bsd-finger/default.nix @@ -1,17 +1,20 @@ -args: with args; +{ stdenv, fetchurl }: + +# !!! Duplication: this package is almost exactly the same as `bsd-finger'. + stdenv.mkDerivation rec { - name = "bsd-finger-0.17"; + name = "bsd-finger-0.17"; - src = fetchurl { - url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; - sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; - }; + src = fetchurl { + url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/${name}.tar.gz"; + sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244"; + }; - NIX_CFLAGS_COMPILE="-D_GNU_SOURCE"; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; - patches = [./ubuntu-0.17-9.patch]; + patches = [ ./ubuntu-0.17-9.patch ]; - preBuild = "cd finger"; + preBuild = "cd finger"; - preInstall = '' ensureDir $out/man/man1 $out/bin ''; + preInstall = '' ensureDir $out/man/man1 $out/bin ''; } diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index 9ce1731eb76..86430d3865c 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1 +1,22 @@ -import ./iodine-0.4.1.nix +{ stdenv, fetchurl, zlib, nettools }: + +stdenv.mkDerivation rec { + name = "iodine-0.4.1"; + + src = fetchurl { + url = "http://code.kryo.se/iodine/${name}.tar.gz"; + sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5"; + }; + + buildInputs = [ zlib ]; + + patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; + + installFlags = "prefix=\${out}"; + + meta = { + homepage = http://code.kryo.se/iodine/; + description = "Tool to tunnel IPv4 data through a DNS server"; + license = "ISC"; + }; +} diff --git a/pkgs/tools/networking/iodine/iodine-0.4.1.nix b/pkgs/tools/networking/iodine/iodine-0.4.1.nix deleted file mode 100644 index e20c86debe3..00000000000 --- a/pkgs/tools/networking/iodine/iodine-0.4.1.nix +++ /dev/null @@ -1,21 +0,0 @@ -args: with args; -stdenv.mkDerivation rec { - name = "iodine-0.4.1"; - - src = fetchurl { - url = "http://code.kryo.se/iodine/${name}.tar.gz"; - sha256 = "1d0v6wbrciwd0xi9khrna956v5wy7wy1inllzrn187as358kiiv5"; - }; - - buildInputs = [zlib]; - - patchPhase = ''sed -i "s,/sbin/ifconfig,${nettools}/sbin/ifconfig,; s,/sbin/route,${nettools}/sbin/route," src/tun.c''; - - installFlags = "prefix=\${out}"; - - meta = { - homepage = http://code.kryo.se/iodine/; - description = "iodine lets you tunnel IPv4 data through a DNS server."; - license = "ISC"; - }; -} diff --git a/pkgs/tools/networking/iperf/default.nix b/pkgs/tools/networking/iperf/default.nix index e799e5118f9..1cb984e3d1c 100644 --- a/pkgs/tools/networking/iperf/default.nix +++ b/pkgs/tools/networking/iperf/default.nix @@ -1,14 +1,13 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "iperf-2.0.4"; - src = args.fetchurl { + src = fetchurl { url = http://garr.dl.sourceforge.net/sourceforge/iperf/iperf-2.0.4.tar.gz; sha256 = "0i3r75prbyxs56rngjbrag8rg480ki3daaa924krrafng30z2liv"; }; -#buildInputs =(with args; []); - meta = { homepage = ""; description = "tool to measure IP bandwidth using UDP or TCP"; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 8f4c18c06c3..b1456c0666e 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -1,5 +1,6 @@ -args: with args; -stdenv.mkDerivation ( rec { +{ stdenv, fetchurl, pkgconfig, openssl, libsigcxx }: + +stdenv.mkDerivation rec { pname = "libtorrent"; version = "0.12.6"; @@ -15,4 +16,4 @@ stdenv.mkDerivation ( rec { meta = { description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code"; }; -}) +} diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index a74bbc72523..eee5b5acbaa 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -1,5 +1,7 @@ -args: with args; -stdenv.mkDerivation ( rec { +{ stdenv, fetchurl, libtorrent, ncurses, pkgconfig, libsigcxx, curl +, zlib, openssl }: + +stdenv.mkDerivation rec { pname = "rtorrent"; version = "0.8.6"; @@ -15,4 +17,4 @@ stdenv.mkDerivation ( rec { meta = { description = "An ncurses client for libtorrent, ideal for use with screen or dtach"; }; -}) +} diff --git a/pkgs/tools/networking/stun/default.nix b/pkgs/tools/networking/stun/default.nix index 8023175c52a..65a1d241c0b 100644 --- a/pkgs/tools/networking/stun/default.nix +++ b/pkgs/tools/networking/stun/default.nix @@ -1,4 +1,5 @@ -args: with args; +{ stdenv, fetchurl }: + stdenv.mkDerivation { name = "stun-0.96.dfsg-5"; @@ -26,11 +27,10 @@ stdenv.mkDerivation { }; meta = { - description = "stun server and test client"; - longDescription = "eg useful to debug voip trouble"; + description = "Stun server and test client"; homepage = http://sourceforge.net/projects/stun/; license = "Vovida 1.0"; # See any header file. - maintainers = [args.lib.maintainers.marcweber]; - platforms = args.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.marcweber ]; + platforms = stdenv.lib.platforms.linux; }; } |