diff options
Diffstat (limited to 'pkgs/tools/networking')
31 files changed, 204 insertions, 107 deletions
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index 39ee40994a75..21f03f27ab70 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ iElectric viric garbas chaoflow nckx ]; + maintainers = with maintainers; [ domenkozar viric garbas chaoflow nckx ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 53392857f2ab..4f05220232fc 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, gettext }: +{ stdenv, fetchurl, gettext, autoreconfHook }: stdenv.mkDerivation rec { name = "axel-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; - sha256 = "17j6kp4askr1q5459ak71m1bm0qa3dyqbxvi5ifh2bjvjlp516mx"; + sha256 = "174x4bp4gcwmpf94hdsdxlpk7q7ldgpsicry7x2pa9zw4yz86wl0"; }; - buildInputs = [ gettext ]; + buildInputs = [ gettext autoreconfHook ]; installFlags = [ "ETCDIR=$(out)/etc" ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 7af692f782e8..c9380761f9fa 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig, openconnect, file, +{ stdenv, fetchurl, pkgconfig, openconnect, file, gawk, openvpn, vpnc, glib, dbus, iptables, gnutls, polkit, - wpa_supplicant, readline6, pptp, ppp, tree }: + wpa_supplicant, readline6, pptp, ppp }: stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.31"; - src = fetchgit { - url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; - rev = "refs/tags/${version}"; - sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893"; + version = "1.32"; + src = fetchurl { + url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; + sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"; }; - buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit - file openvpn vpnc glib dbus iptables gnutls - wpa_supplicant readline6 pptp ppp tree ]; + buildInputs = [ openconnect polkit + openvpn vpnc glib dbus iptables gnutls + wpa_supplicant readline6 pptp ppp ]; + + nativeBuildInputs = [ pkgconfig file gawk ]; preConfigure = '' export WPASUPPLICANT=${wpa_supplicant}/sbin/wpa_supplicant - ./bootstrap + export PPPD=${ppp}/sbin/pppd + export AWK=${gawk}/bin/gawk sed -i "s/\/usr\/bin\/file/file/g" ./configure - substituteInPlace configure --replace /usr/sbin/pptp ${pptp}/sbin/pptp - substituteInPlace configure --replace /usr/sbin/pppd ${ppp}/sbin/pppd ''; configureFlags = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation rec { "--enable-tools" "--enable-datafiles" "--enable-pptp" + "--with-pptp=${pptp}/sbin/pptp" ]; postInstall = '' diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index c706984e8356..4d66565406c2 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -51,6 +51,6 @@ stdenv.mkDerivation rec { homepage = http://www.datadoghq.com; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice iElectric ]; + maintainers = with stdenv.lib.maintainers; [ thoughtpolice domenkozar ]; }; } diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index 23f081c8be35..985344616e92 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9"; }; - configureFlags = '' - ${optionalString stdenv.isLinux "--with-systemd"} - ''; + configureFlags = optional stdenv.isLinux "--with-systemd"; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/fping/default.nix b/pkgs/tools/networking/fping/default.nix index ab935dc11118..83899c2380c3 100644 --- a/pkgs/tools/networking/fping/default.nix +++ b/pkgs/tools/networking/fping/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "fping-3.10"; + name = "fping-3.13"; src = fetchurl { url = "http://www.fping.org/dist/${name}.tar.gz"; - sha256 = "1n2psfxgww6wg5rz8rly06xkghgp8lshx2lx6rramrigyd1fhiyd"; + sha256 = "082pis2c2ad6kkj35zmsf6xb2lm8v8hdrnjiwl529ldk3kyqxcjb"; }; meta = { diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix new file mode 100644 index 000000000000..2f95123ba212 --- /dev/null +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -0,0 +1,28 @@ +{ stdenv, pythonPackages, fetchFromGitHub }: + +with pythonPackages; + +buildPythonPackage rec { + namePrefix = ""; + name = "gandi-cli-${version}"; + version = "0.18"; + + src = fetchFromGitHub { + sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3"; + rev = version; + repo = "gandi.cli"; + owner = "Gandi"; + }; + + propagatedBuildInputs = [ click ipy pyyaml requests ]; + + doCheck = false; # Tests try to contact the actual remote API + + meta = with stdenv.lib; { + description = "Command-line interface to the public Gandi.net API"; + homepage = http://cli.gandi.net/; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ nckx ]; + }; +} + diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index d11e154817d4..3eb0e9d2a90a 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { meta = { description = "A program for retrieving mail"; - maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ]; + maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.domenkozar ]; platforms = stdenv.lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; diff --git a/pkgs/tools/networking/imapsync/default.nix b/pkgs/tools/networking/imapsync/default.nix index d6ac630b122e..d01e0ededb3d 100644 --- a/pkgs/tools/networking/imapsync/default.nix +++ b/pkgs/tools/networking/imapsync/default.nix @@ -18,7 +18,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ perl openssl MailIMAPClient TermReadKey - IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString ]; + IOSocketSSL DigestHMAC URI FileCopyRecursive IOTee UnicodeString + DataUniqid JSONWebToken TestMockGuard LWP CryptOpenSSLRSA + LWPProtocolHttps + ]; meta = with stdenv.lib; { homepage = http://www.linux-france.org/prj/imapsync/; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index ea7ec605e2bf..bf39c36e02b8 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }: +{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }: stdenv.mkDerivation rec { - name = "lftp-4.6.4"; + name = "lftp-4.7.1"; src = fetchurl { urls = [ "http://lftp.yar.ru/ftp/${name}.tar.bz2" "http://lftp.yar.ru/ftp/old/${name}.tar.bz2" ]; - sha256 = "0zj0dd6s3nzwdawxjp0xw31ipsa4vzimmg5bzq952q2f29vd0akn"; + sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv"; }; - buildInputs = [ gnutls pkgconfig readline zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gnutls readline zlib libidn ]; + + configureFlags = [ + "--with-readline=${readline}" + ]; meta = with stdenv.lib; { description = "A file transfer program supporting a number of network protocols"; diff --git a/pkgs/tools/networking/mpack/default.nix b/pkgs/tools/networking/mpack/default.nix index 0d004a63920e..5a1095506424 100644 --- a/pkgs/tools/networking/mpack/default.nix +++ b/pkgs/tools/networking/mpack/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { meta = { description = "utilities for encoding and decoding binary files in MIME"; - maintainers = [ stdenv.lib.maintainers.simons ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index 967b3863f205..b89d2adea6bc 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = "http://nbd.sourceforge.net"; description = "map arbitrary files as block devices over the network"; license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index afdca314ae64..2d5477ee8e49 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs"; }; + outputs = [ "dev" "out" ]; + preConfigure = '' substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname substituteInPlace configure --replace /usr/bin/file ${file}/bin/file @@ -88,7 +90,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/NetworkManager/; description = "Network configuration and management tool"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ phreedom urkud rickynils iElectric ]; + maintainers = with maintainers; [ phreedom urkud rickynils domenkozar ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index c17c33af17ed..d1a90d9d1aad 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libpcap,/* gnutls, libgcrypt,*/ libxml2, glib , geoip, geolite-legacy, sqlite, which, autoreconfHook, git -, pkgconfig, groff, curl, json_c +, pkgconfig, groff, curl, json_c, luajit, zeromq, rrdtool }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ -# directory. +# directory, but we use luajit, zeromq, and rrdtool from nixpkgs stdenv.mkDerivation rec { name = "ntopng-2.0"; @@ -23,7 +23,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libpcap/* gnutls libgcrypt*/ libxml2 glib geoip geolite-legacy - sqlite which autoreconfHook git pkgconfig groff curl json_c ]; + sqlite which autoreconfHook git pkgconfig groff curl json_c luajit zeromq + rrdtool ]; autoreconfPhase = '' @@ -48,13 +49,15 @@ stdenv.mkDerivation rec { rm -rf httpdocs/geoip ln -s ${geolite-legacy}/share/GeoIP httpdocs/geoip + '' + stdenv.lib.optionalString stdenv.isDarwin '' + sed 's|LIBS += -lstdc++.6||' -i Makefile ''; meta = with stdenv.lib; { description = "High-speed web-based traffic analysis and flow collection tool"; homepage = http://www.ntop.org/products/ntop/; license = licenses.gpl3Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 78ef6998e3a1..ea5e265fa064 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, pkgconfig, libxml2, ncurses, libsigcxx, libpar2 -, gnutls, libgcrypt, zlib }: +, gnutls, libgcrypt, zlib, openssl }: stdenv.mkDerivation rec { name = "nzbget-${version}"; - version = "16.4"; + version = "17.0-r1686"; + filename = "nzbget-17.0-testing-r1686"; src = fetchurl { - url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${name}-src.tar.gz"; - sha256 = "03sdzxxsjpxp82jpk593xls96yk29989z05j73jah21dbpkkx7lf"; + url = "http://github.com/nzbget/nzbget/releases/download/v${version}/${filename}-src.tar.gz"; + sha256 = "0hk0hiccdk3bivdnc2635kqqdwgwf73wvis1wl9k0snds25dwfiw"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls - libgcrypt zlib ]; + libgcrypt zlib openssl ]; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix index 4f8c493a0f0d..ec38ec8d487c 100644 --- a/pkgs/tools/networking/p2p/libtorrent/default.nix +++ b/pkgs/tools/networking/p2p/libtorrent/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { description = "A BitTorrent library written in C++ for *nix, with focus on high performance and good code"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix index 0d676795ab82..2883043f8b76 100644 --- a/pkgs/tools/networking/p2p/rtorrent/default.nix +++ b/pkgs/tools/networking/p2p/rtorrent/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "An ncurses client for libtorrent, ideal for use with screen, tmux, or dtach"; platforms = platforms.unix; - maintainers = with maintainers; [ simons ebzzry codyopel ]; + maintainers = with maintainers; [ ebzzry codyopel ]; }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index aa1b01c11fad..b01566bed075 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -61,7 +61,7 @@ pythonPackages.buildPythonApplication rec { ''; homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; - maintainers = with lib.maintainers; [ simons MostAwesomeDude ]; + maintainers = with lib.maintainers; [ MostAwesomeDude ]; platforms = lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index fa3fc4472f3b..a5b548c80852 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { ''; hydraPlatforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; + maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index fc4ca793199d..1c8ef67a7830 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-2.12"; + name = "radvd-2.13"; src = fetchurl { url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; - sha256 = "0yvlzzdxz2h5fm7grbf1xfs8008bzcdjpficm2cf52g771rffw5h"; + sha256 = "1lzgg6zpizcldb78n5gkykjnpr7sqm4r1xy9bm4ig0chbrink4ka"; }; buildInputs = [ pkgconfig libdaemon bison flex check ]; diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix index e49f2e5dd63a..25068f8916be 100644 --- a/pkgs/tools/networking/shadowsocks-libev/default.nix +++ b/pkgs/tools/networking/shadowsocks-libev/default.nix @@ -6,8 +6,8 @@ let - version = "2.4.5"; - sha256 = "08bf7f240ee39fa700aac636ca84b65f2f0cfbcfa63a0783afb05872940067e2"; + version = "2.4.6"; + sha256 = "c87781bc280d7a7180cf82b17ad4e8f38242c73431d5b4b6cd4ccd0c29e1fe93"; in diff --git a/pkgs/tools/networking/snabb/default.nix b/pkgs/tools/networking/snabb/default.nix index 8ba9cfa6dad8..f6b115805982 100644 --- a/pkgs/tools/networking/snabb/default.nix +++ b/pkgs/tools/networking/snabb/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { cp src/snabb $out/bin ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://github.com/SnabbCo/snabbswitch; description = "Simple and fast packet networking toolkit"; @@ -44,7 +46,7 @@ stdenv.mkDerivation rec { ''; platforms = [ "x86_64-linux" ]; license = licenses.asl20; - maintainers = [ maintainers.lukego maintainers.iElectric ]; + maintainers = [ maintainers.lukego maintainers.domenkozar ]; }; } diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix index de5ba4c18e12..b82e1e337a7c 100644 --- a/pkgs/tools/networking/speedtest-cli/default.nix +++ b/pkgs/tools/networking/speedtest-cli/default.nix @@ -14,6 +14,6 @@ pythonPackages.buildPythonApplication rec { description = "Command line interface for testing internet bandwidth using speedtest.net"; platforms = platforms.all; license = licenses.asl20; - maintainers = [ maintainers.iElectric ]; + maintainers = [ maintainers.domenkozar ]; }; } diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 3e8f3ca3dc59..f8a8b6393d21 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -5,33 +5,34 @@ stdenv.mkDerivation rec { name = "swec-0.4"; src = fetchurl { - url = "http://random.zerodogg.org/files/${name}.tar.bz2"; + url = "http://files.zerodogg.org/swec/${name}.tar.bz2"; sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx"; }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; - configurePhase = - '' for i in swec tests/{runTests,testServer} - do - sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' - done - ''; - - buildPhase = "true"; - installPhase = - '' make install prefix="$out" - - mkdir -p "$out/share/${name}" - cp -v default.sdf "$out/share/${name}" - sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" - - wrapProgram "$out/bin/swec" \ - --prefix PERL5LIB : \ - ${stdenv.lib.concatStringsSep ":" - (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} - ''; + configurePhase = '' + for i in swec tests/{runTests,testServer} + do + sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g' + done + ''; + + dontBuild = true; + + installPhase = '' + make install prefix="$out" + + mkdir -p "$out/share/${name}" + cp -v default.sdf "$out/share/${name}" + sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g" + + wrapProgram "$out/bin/swec" \ + --prefix PERL5LIB : \ + ${stdenv.lib.concatStringsSep ":" + (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])} + ''; doCheck = true; checkPhase = "make test"; diff --git a/pkgs/tools/networking/tcpflow/default.nix b/pkgs/tools/networking/tcpflow/default.nix index 935251ba0579..52727f1c49e7 100644 --- a/pkgs/tools/networking/tcpflow/default.nix +++ b/pkgs/tools/networking/tcpflow/default.nix @@ -1,29 +1,61 @@ -{stdenv, fetchurl, openssl, zlib, libpcap, boost, cairo}: -let - s = # Generated upstream information - rec { - baseName="tcpflow"; - version="1.4.5"; - name="${baseName}-${version}"; - hash="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk"; - url="http://www.digitalcorpora.org/downloads/tcpflow/tcpflow-1.4.5.tar.gz"; - sha256="0whcyykq710s84jyiaqp6rsr19prd0pr1g1pg74mif0ig51yv7zk"; +{ stdenv, lib, fetchFromGitHub, openssl, zlib, libpcap, boost, cairo, automake, autoconf, useCairo ? false }: + +stdenv.mkDerivation rec { + baseName = "tcpflow"; + version = "1.4.6"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "simsong"; + repo = "tcpflow"; + rev = "017687365b8233d16260f4afd7572c8ad8873cf6"; + sha256 = "002cqmn786sjysf59xnbb7lgr23nqqslb2gvy29q2xpnq6my9w38"; }; - buildInputs = [ - openssl zlib libpcap boost cairo - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; + + be13_api = fetchFromGitHub { + owner = "simsong"; + repo = "be13_api"; + rev = "8f4f4b3fe0b4815babb3a6fb595eb9a6d07e8a2e"; + sha256 = "1dlys702x3m8cr9kf4b9j8n28yh6knhwgqkm6a5yhh1grd8r3ksm"; }; - meta = { - inherit (s) version; + + dfxml = fetchFromGitHub { + owner = "simsong"; + repo = "dfxml"; + rev = "13a8cc22189a8336d16777f2897ada6ae2ee59de"; + sha256 = "0wzhbkp4c8sp6wrk4ilz3skxp14scdnm3mw2xmxxrsifymzs2f5n"; + }; + + httpparser = fetchFromGitHub { + owner = "nodejs"; + repo = "http-parser"; + rev = "8d9e5db981b623fffc93657abacdc80270cbee58"; + sha256 = "0x17wwhrc7b2ngiqy0clnzn1zz2gbcz5n9m29pcyrcplly782k52"; + }; + + buildInputs = [ openssl zlib libpcap boost automake autoconf ] ++ lib.optional useCairo cairo; + + postUnpack = '' + pushd tcpflow-*-src/src + cp -rv ${be13_api}/* be13_api/ + cp -rv ${dfxml}/* dfxml/ + cp -rv ${httpparser}/* http-parser/ + chmod -R u+w dfxml + popd + ''; + + prePatch = '' + substituteInPlace ./bootstrap.sh \ + --replace \ git 'echo git' \ + --replace /bin/rm rm + ''; + + preConfigure = "bash ./bootstrap.sh"; + + meta = with stdenv.lib; { description = ''TCP stream extractor''; - license = stdenv.lib.licenses.gpl3 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3 ; + maintainers = with maintainers; [ raskin obadz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index f870b5463b60..bd4be0f1b867 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -2,14 +2,15 @@ , docbook_xsl }: let - version = "1.0.60"; + version = "1.0.63"; in stdenv.mkDerivation rec { name = "tgt-${version}"; + src = fetchFromGitHub { owner = "fujita"; repo = "tgt"; - rev = "ab51727a361bf296b1c2036375b5e45479059921"; - sha256 = "1bf8rn3mavjrzkp5k23akqn5ilw43g8mpfr68z1bi8s9lr2gkf37"; + rev = "v${version}"; + sha256 = "1x3irnbfikdqhlikhwqazg0g0hc1df5r2bp001f13sr0nvw28y1n"; }; buildInputs = [ libxslt systemd libaio docbook_xsl ]; @@ -30,6 +31,7 @@ in stdenv.mkDerivation rec { ''; enableParallelBuilding = true; + meta = { description = "iSCSI Target daemon with rdma support"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index df3465969bb7..7fbbc55dd619 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.26"; + version = "1.0.28"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "08ds8s32cjslms1q227ihd6jz35583v378ij4pknfa5xngfijhrb"; + sha256 = "0i5kx3hza359nclyhb60kxlzqyx0phmg175350hww28g6scjcl0b"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 5473a637b6a3..61e4ee281edc 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -2,15 +2,16 @@ stdenv.mkDerivation rec { name = "tinc-${version}"; - rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356"; - version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}"; + version = "1.1pre14"; src = fetchgit { - inherit rev; + rev = "refs/tags/release-${version}"; url = "git://tinc-vpn.org/tinc"; - sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf"; + sha256 = "0idc4ddhz380xw26c8wwdyr0p6pibada55f0hzhnc2cz9za9x4iv"; }; + outputs = [ "out" "doc" ]; + nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; @@ -18,6 +19,10 @@ stdenv.mkDerivation rec { substituteInPlace configure.ac --replace UNKNOWN ${version} ''; + postInstall = '' + rm $out/bin/tinc-gui + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" diff --git a/pkgs/tools/networking/vpnc/default.nix b/pkgs/tools/networking/vpnc/default.nix index c62d5addb59f..e1905e2deb65 100644 --- a/pkgs/tools/networking/vpnc/default.nix +++ b/pkgs/tools/networking/vpnc/default.nix @@ -53,6 +53,5 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.simons ]; }; } diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 702948204252..9294d4c88ae7 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { ./fix-app-icon.patch ./fix-gtk-issues.patch ./urwid-api-update.patch + ./fix-curses.patch ]; # Should I be using pygtk's propogated build inputs? diff --git a/pkgs/tools/networking/wicd/fix-curses.patch b/pkgs/tools/networking/wicd/fix-curses.patch new file mode 100644 index 000000000000..138dfbabfd5c --- /dev/null +++ b/pkgs/tools/networking/wicd/fix-curses.patch @@ -0,0 +1,15 @@ +--- a/curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300 ++++ b/curses/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300 +@@ -1153,9 +1153,10 @@ + if not ui._started: + return False + +- input_data = ui.get_input_nonblocking() ++ ui.set_input_timeouts(max_wait=0) ++ input_data = ui.get_input() + # Resolve any "alarms" in the waiting +- self.handle_keys(input_data[1]) ++ self.handle_keys(input_data) + + # Update the screen + canvas = self.frame.render((self.size), True) |