diff options
Diffstat (limited to 'pkgs/tools/networking')
43 files changed, 145 insertions, 106 deletions
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix index d7e1b2289dca..2e982d0f912d 100644 --- a/pkgs/tools/networking/aircrack-ng/default.nix +++ b/pkgs/tools/networking/aircrack-ng/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { description = "Wireless encryption cracking tools"; homepage = http://www.aircrack-ng.org/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ domenkozar viric garbas chaoflow nckx ]; + maintainers = with maintainers; [ domenkozar viric garbas chaoflow ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 079beedcc07c..29186906d27b 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.33.0"; + version = "1.33.1"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "07i9wrj7bs9770ppx943zgn8j9zvffxg2pib4w5ljxapqldhwrsq"; + sha256 = "0ai84ijgsvnixwhxkj8if2mj9hcg2a41w81vy8bdvi89h3bmq9zf"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/biosdevname/default.nix b/pkgs/tools/networking/biosdevname/default.nix index ae36980a60d8..93a98a10daad 100644 --- a/pkgs/tools/networking/biosdevname/default.nix +++ b/pkgs/tools/networking/biosdevname/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "biosdevname-${version}"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "dell"; repo = "biosdevname"; rev = "v${version}"; - sha256 = "183k6f9nayhai27y6nizf0sp9bj1kabykj66hcwdzllhrrh505sd"; + sha256 = "19wbb79x9h79k55sgd4dylvdbhhrvfaiaknbw9s1wvfmirkxa1dz"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index 48ae772e1271..c0383b7c822f 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation rec { buildInputs = [ python gyp ] ++ lib.optional stdenv.isLinux utillinux; - + buildPhase = '' python ./gyp_bud -f make make -C out ''; installPhase = '' - ensureDir $out/bin + mkdir -p $out/bin cp out/Release/bud $out/bin ''; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index be42c4a1381a..dbe2a6639352 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -24,11 +24,11 @@ assert brotliSupport -> brotli != null; assert gssSupport -> kerberos != null; stdenv.mkDerivation rec { - name = "curl-7.57.0"; + name = "curl-7.58.0"; src = fetchurl { - url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "09j88lzqmi79rvvg2l7bjcs56330bq388f5p468hgblf6hdf6by9"; + url = "https://curl.haxx.se/download/${name}.tar.bz2"; + sha256 = "0cg7klhf1ksnbw5wvwa802qir877zv4y3dj7swz1xh07g3wq3c0w"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/darkstat/default.nix b/pkgs/tools/networking/darkstat/default.nix index ce371e74ee02..4ec23862522e 100644 --- a/pkgs/tools/networking/darkstat/default.nix +++ b/pkgs/tools/networking/darkstat/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { ''; homepage = http://unix4lyfe.org/darkstat; license = licenses.gpl2; - maintainers = with maintainers; [ nckx ]; platforms = with platforms; unix; }; } diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix index 19c2383c1c28..2599e822529f 100644 --- a/pkgs/tools/networking/dhcping/default.nix +++ b/pkgs/tools/networking/dhcping/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://www.mavetju.org/unix/general.php; license = licenses.bsd2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/eternal-terminal/default.nix b/pkgs/tools/networking/eternal-terminal/default.nix new file mode 100644 index 000000000000..8941494e316e --- /dev/null +++ b/pkgs/tools/networking/eternal-terminal/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, gflags, glog, libsodium, protobuf }: + +stdenv.mkDerivation rec { + name = "eternal-terminal-${version}"; + version = "4.1.2"; + + src = fetchFromGitHub { + owner = "MisterTea"; + repo = "EternalTCP"; + rev = "refs/tags/et-v${version}"; + sha256 = "1zy30ccsddgs2wqwxphnx5i00j4gf69lr68mzg9x6imqfz0sbcjz"; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ gflags glog libsodium protobuf ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Remote shell that automatically reconnects without interrupting the session"; + license = licenses.asl20; + homepage = https://mistertea.github.io/EternalTCP/; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix index c2bf6702c5f6..be488e788b41 100644 --- a/pkgs/tools/networking/gandi-cli/default.nix +++ b/pkgs/tools/networking/gandi-cli/default.nix @@ -22,7 +22,6 @@ buildPythonPackage rec { 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/hans/default.nix b/pkgs/tools/networking/hans/default.nix index 2e84aa960079..82e105c3a3be 100644 --- a/pkgs/tools/networking/hans/default.nix +++ b/pkgs/tools/networking/hans/default.nix @@ -34,6 +34,5 @@ stdenv.mkDerivation rec { homepage = http://code.gerade.org/hans/; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix index ce58da880d63..bfe9f115133c 100644 --- a/pkgs/tools/networking/httping/default.nix +++ b/pkgs/tools/networking/httping/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { latency of the webserver + network. It supports IPv6. ''; license = licenses.agpl3; - maintainers = with maintainers; [ nckx rickynils ]; + maintainers = with maintainers; [ rickynils ]; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/i2p/default.nix b/pkgs/tools/networking/i2p/default.nix index d66ff70180ac..ec268d5d77f6 100644 --- a/pkgs/tools/networking/i2p/default.nix +++ b/pkgs/tools/networking/i2p/default.nix @@ -27,10 +27,10 @@ let wrapper = stdenv.mkDerivation rec { in stdenv.mkDerivation rec { - name = "i2p-0.9.32"; + name = "i2p-0.9.33"; src = fetchurl { url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz"; - sha256 = "1c82yckwzp51wqrr8qhww3sifm1a9nzrymsf9qv99ngsxq4n5l6i"; + sha256 = "1hlildi34p34xgpm0gqh09r2jb6nsa7a52gr074r6203xkl2racw"; }; buildInputs = [ jdk ant gettext which ]; patches = [ ./i2p.patch ]; diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index 66057e5c76e7..dad00cfd9ee1 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,20 +1,33 @@ -{ stdenv, fetchFromGitHub, fetchpatch, boost, zlib, openssl }: +{ stdenv, fetchFromGitHub, fetchpatch +, boost, zlib, openssl +, upnpSupport ? true, miniupnpc ? null +, aesniSupport ? false +, avxSupport ? false +}: + +assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { name = pname + "-" + version; pname = "i2pd"; - version = "2.15.0"; + version = "2.18.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "02nyk76q2ag0495ph62i0jij27nxpy6qvryjp25wah8f69k7bgfs"; + sha256 = "019psm86n4k7nzxhw7cnbw144gqni59sf35wiy58a6x6dabmvq8h"; }; - buildInputs = [ boost zlib openssl ]; - makeFlags = [ "USE_AESNI=no" "USE_AVX=no" ]; + buildInputs = with stdenv.lib; [ boost zlib openssl ] + ++ optional upnpSupport miniupnpc; + makeFlags = + let ynf = a: b: a + "=" + (if b then "yes" else "no"); in + [ (ynf "USE_AESNI" aesniSupport) + (ynf "USE_AVX" avxSupport) + (ynf "USE_UPNP" upnpSupport) + ]; installPhase = '' install -D i2pd $out/bin/i2pd diff --git a/pkgs/tools/networking/iftop/default.nix b/pkgs/tools/networking/iftop/default.nix index 9e432c946cf5..96723146ad41 100644 --- a/pkgs/tools/networking/iftop/default.nix +++ b/pkgs/tools/networking/iftop/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; homepage = http://ex-parrot.com/pdw/iftop/; platforms = platforms.unix; - maintainers = [ maintainers.mornfall ]; + maintainers = [ ]; }; } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 219a993b8a29..99997eb927f2 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "inadyn-${version}"; - version = "2.2.1"; + version = "2.3"; src = fetchFromGitHub { owner = "troglobit"; diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix index 22eb31384a19..0506c8580296 100644 --- a/pkgs/tools/networking/ip2location/default.nix +++ b/pkgs/tools/networking/ip2location/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://www.ip2location.com/free/applications; license = with licenses; [ gpl3Plus lgpl3Plus ]; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/tools/networking/iperf/2.nix index 6f2ca96d120f..94be3c25d1fc 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/tools/networking/iperf/2.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "iperf-2.0.9"; + name = "iperf-2.0.10"; src = fetchurl { url = "mirror://sourceforge/iperf2/files/${name}.tar.gz"; - sha256 = "1gzh8dk2myqgxznxrryib4zsw23ffvx0s5j7sa780vk86lgr20nv"; + sha256 = "1whyi7lxrkllmbs7i1avc6jq8fvirn64mhx9197bf4x3rj6k9r3z"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix index b28ea0dbbe52..f28c75774db5 100644 --- a/pkgs/tools/networking/ipv6calc/default.nix +++ b/pkgs/tools/networking/ipv6calc/default.nix @@ -51,6 +51,5 @@ stdenv.mkDerivation rec { homepage = http://www.deepspace6.net/projects/ipv6calc.html; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index 1d7932c7ad38..cd0821ef9ef5 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -15,6 +15,8 @@ stdenv.mkDerivation { patches = [ ./connect.patch ./service-name.patch ]; + makeFlags = [ "AR=${stdenv.cc.bintools.targetPrefix}ar" ]; + meta = { description = "A client for the WHOIS protocol allowing you to query the owner of a domain name"; homepage = http://www.gnu.org/software/jwhois/; diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix index f33fe7a7105c..67428664556a 100644 --- a/pkgs/tools/networking/kea/default.nix +++ b/pkgs/tools/networking/kea/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "kea"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz"; - sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92"; + sha256 = "14f32lsdd1824cx9a4l4pfbhq1d4jik6l6hxd911ihi64nzwvpvf"; }; patches = [ ./dont-create-var.patch ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index fe8988dc41d9..140ea6860fc3 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "keepalived-${version}"; - version = "1.3.6"; + version = "1.4.1"; src = fetchFromGitHub { owner = "acassen"; repo = "keepalived"; rev = "v${version}"; - sha256 = "05088vv510dlflzyg8sh8l8qfscnvxl6n6pw9ycp27zhb6r5cr5y"; + sha256 = "1d3jnfhj9mpnc27wvgsiz2vr4lnvvccw3v128z16jpyibyv20ph0"; }; buildInputs = [ diff --git a/pkgs/tools/networking/lldpd/default.nix b/pkgs/tools/networking/lldpd/default.nix index 1ce9f7cb3230..20e65c5ea3ca 100644 --- a/pkgs/tools/networking/lldpd/default.nix +++ b/pkgs/tools/networking/lldpd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "lldpd-${version}"; - version = "0.9.8"; + version = "0.9.9"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${name}.tar.gz"; - sha256 = "0kwck17cr2f1a395a8bfmj7fz1n4i1hv429cbdbkhff33glr9r4y"; + sha256 = "1nq2z03hbs5qc3kdk3rdxcwcsrxilhcqx7xw3iipc4yj03shi7jy"; }; configureFlags = [ diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix index 307b17a7a7c0..e81297e6dd82 100644 --- a/pkgs/tools/networking/minissdpd/default.nix +++ b/pkgs/tools/networking/minissdpd/default.nix @@ -31,6 +31,5 @@ stdenv.mkDerivation rec { downloadPage = http://miniupnp.free.fr/files/; license = licenses.bsd3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 3e3b4ec34a30..a623b9fbfe9d 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -24,6 +24,5 @@ stdenv.mkDerivation rec { homepage = http://miniupnp.free.fr/; description = "A daemon that implements the UPnP Internet Gateway Device (IGD) specification"; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix index 7c22891ab7a3..8c9247013778 100644 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, pkgconfig, libbsd}: stdenv.mkDerivation rec { - version = "1.130"; - deb-version = "${version}-3"; + version = "1.187"; + deb-version = "${version}-1"; name = "netcat-openbsd-${version}"; srcs = [ (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${version}.orig.tar.gz"; - sha256 = "0nqy14yvclgzs98gv0fwp6jlfpfy2kk367zka648jiqbbl30awpx"; + sha256 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; }) (fetchurl { url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0f9409vjm6v8a7m1zf5sr7wj6v5v8414i5vvxx1r45c11h69hh9a"; + sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; }) ]; @@ -20,11 +20,18 @@ stdenv.mkDerivation rec { buildInputs = [ libbsd ]; sourceRoot = name; - patches = [ "../debian/patches/*.patch" ]; + + prePatch = '' + for i in $(cat ../debian/patches/series); do + patch -p1 < "../debian/patches/$i" + done + ''; installPhase = '' + runHook preInstall install -Dm0755 nc $out/bin/nc install -Dm0644 nc.1 $out/share/man/man1/nc.1 + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index 6619d0a0f693..aca7643e7ac3 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -58,6 +58,5 @@ stdenv.mkDerivation rec { homepage = http://netsniff-ng.org/; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index d0881c5ac5e5..f2c0bb13afe8 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { name = "${pname}-${major}.${minor}"; pname = "network-manager-applet"; major = "1.8"; - minor = "2"; + minor = "6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "09f9hjpn9nkhw57mk6pi7q1bq3lhf5hvmwas0fknscssak7yjmry"; + sha256 = "0c4wxwxpa7wlskvnqaqfa7mmc0c6a2pj7jcvymcchjnq4wn9wx01"; }; configureFlags = [ diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 6005314ea97b..b6201e308d9a 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; major = "1.10"; - version = "${major}.0"; + version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "1ph45rqpl8p9k4rirhss0hpf104clm8fp322p6kh6q75y06ddfwa"; + sha256 = "0nv2jm2lsidlrzn4dkbc5rpj8ma4cpzjqz8z8dmwkqvh0zsk970n"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/tools/networking/network-manager/iodine.nix b/pkgs/tools/networking/network-manager/iodine.nix index 154b54952f2d..0cfc8bbba7db 100644 --- a/pkgs/tools/networking/network-manager/iodine.nix +++ b/pkgs/tools/networking/network-manager/iodine.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + configureFlags = [ "${if withGnome then "--with-gnome" else "--without-gnome"}" "--disable-static" diff --git a/pkgs/tools/networking/network-manager/strongswan.nix b/pkgs/tools/networking/network-manager/strongswan.nix index f26571874644..365aec88a7d6 100644 --- a/pkgs/tools/networking/network-manager/strongswan.nix +++ b/pkgs/tools/networking/network-manager/strongswan.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig ]; + # Fixes deprecation errors with networkmanager 1.10.2 + NIX_CFLAGS_COMPILE = "-Wno-deprecated-declarations"; + preConfigure = '' substituteInPlace "configure" \ --replace "/sbin/sysctl" "${procps}/bin/sysctl" diff --git a/pkgs/tools/networking/ngrep/default.nix b/pkgs/tools/networking/ngrep/default.nix index dcc0e8596e9f..ca5e0b7c4f5d 100644 --- a/pkgs/tools/networking/ngrep/default.nix +++ b/pkgs/tools/networking/ngrep/default.nix @@ -1,39 +1,35 @@ -{ stdenv, fetchurl, fetchpatch, libpcap, gnumake3, pcre }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, libpcap, gnumake3, pcre }: stdenv.mkDerivation rec { - name = "ngrep-1.45"; + name = "ngrep-${version}"; + version = "1.47"; - src = fetchurl { - url = "mirror://sourceforge/ngrep/${name}.tar.bz2"; - sha256 = "19rg8339z5wscw877mz0422wbsadds3mnfsvqx3ihy58glrxv9mf"; + src = fetchFromGitHub { + owner = "jpr5"; + repo = "ngrep"; + rev = "V${lib.replaceStrings ["."] ["_"] version}"; + sha256 = "1x2fyd7wdqlj1r76ilal06cl2wmbz0ws6i3ys204sbjh1cj6dcl7"; }; patches = [ (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_debian-build.diff?h=debian/1.45.ds2-14"; - sha256 = "1p359k54xjbh6r0d0lv1l679n250wxk6j8yyz23gn54kwdc29zfy"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/10_man-fixes.diff?h=debian/1.45.ds2-14"; - sha256 = "1b66zfbsrsvg60j988i6ga9iif1c34fsbq3dp1gi993xy4va8m5k"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/20_setlocale.diff?h=debian/1.45.ds2-14"; - sha256 = "16xbmnmvw5sjidz2qhay68k3xad05g74nrccflavxbi0jba52fdq"; - }) - (fetchpatch { - url = "https://anonscm.debian.org/cgit/users/rfrancoise/ngrep.git/plain/debian/patches/40_ipv6-offsets.diff?h=debian/1.45.ds2-14"; - sha256 = "0fjlk1sav5nnjapvsa8mvdwjkhgm3kgc6dw7r9h1qx6d3b8cgl76"; + url = "https://patch-diff.githubusercontent.com/raw/jpr5/ngrep/pull/11.patch"; + sha256 = "0k5qzvj8j3r1409qwwvzp7m3clgs2g7hs4q68bhrqbrsvvb2h5dh"; }) ]; - buildInputs = [ gnumake3 libpcap pcre ]; + nativeBuildInputs = [ autoreconfHook gnumake3 ]; + buildInputs = [ libpcap pcre ]; + + configureFlags = [ + "--enable-ipv6" + "--enable-pcre" + "--disable-pcap-restart" + "--with-pcap-includes=${libpcap}/include" + ]; preConfigure = '' - # Fix broken test for BPF header file sed -i "s|BPF=.*|BPF=${libpcap}/include/pcap/bpf.h|" configure - - configureFlags="$configureFlags --enable-ipv6 --enable-pcre --disable-pcap-restart --with-pcap-includes=${libpcap}/include" ''; meta = with stdenv.lib; { @@ -47,7 +43,7 @@ stdenv.mkDerivation rec { null interfaces, and understands BPF filter logic in the same fashion as more common packet sniffing tools, such as tcpdump and snoop. ''; - homepage = http://ngrep.sourceforge.net/; + homepage = https://github.com/jpr5/ngrep/; # <ngrep>/doc/README.txt says that ngrep itself is licensed under a # 'BSD-like' license but that the 'regex' library (in the ngrep tarball) is # GPLv2. diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix index 4295151516d8..86a029bcb3de 100644 --- a/pkgs/tools/networking/offlineimap/default.nix +++ b/pkgs/tools/networking/offlineimap/default.nix @@ -2,7 +2,7 @@ asciidoc, libxml2, libxslt, docbook_xml_xslt }: pythonPackages.buildPythonApplication rec { - version = "7.1.4"; + version = "7.1.5"; name = "offlineimap-${version}"; namePrefix = ""; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { owner = "OfflineIMAP"; repo = "offlineimap"; rev = "v${version}"; - sha256 = "04y2bsgmxykkhcjh3540y2a43xrwfkzd7wks1wvl6av0vjaqa5gm"; + sha256 = "0qm5vhzm8hkab2zs2l8ffg754wkws2nyd4pwb332v3zckf11flzd"; }; postPatch = '' diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 663e7be7e5f3..1c135cd36f48 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -1,15 +1,12 @@ { stdenv, fetchurl, fetchpatch, zlib, openssl, perl, libedit, pkgconfig, pam, autoreconfHook , etcDir ? null , hpnSupport ? false -, withKerberos ? false +, withKerberos ? true , withGssapiPatches ? false , kerberos , linkOpenssl? true }: -assert withKerberos -> kerberos != null; -assert withGssapiPatches -> withKerberos; - let # **please** update this patch when you update to a new openssh release. @@ -23,8 +20,6 @@ let in with stdenv.lib; stdenv.mkDerivation rec { - # Please ensure that openssh_with_kerberos still builds when - # bumping the version here! name = "openssh-${version}"; version = if hpnSupport then "7.5p1" else "7.6p1"; @@ -47,7 +42,7 @@ stdenv.mkDerivation rec { # See discussion in https://github.com/NixOS/nixpkgs/pull/16966 ./dont_create_privsep_path.patch ] - ++ optional withGssapiPatches gssapiPatch; + ++ optional withGssapiPatches (assert withKerberos; gssapiPatch); postPatch = # On Hydra this makes installation fail (sometimes?), @@ -59,7 +54,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib openssl libedit pam ] ++ optional withKerberos kerberos - ++ optional hpnSupport autoreconfHook; + ++ optional hpnSupport autoreconfHook + ; preConfigure = '' # Setting LD causes `configure' and `make' to disagree about which linker @@ -78,7 +74,7 @@ stdenv.mkDerivation rec { "--disable-strip" (if pam != null then "--with-pam" else "--without-pam") ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}" - ++ optional withKerberos "--with-kerberos5=${kerberos}" + ++ optional withKerberos (assert kerberos != null; "--with-kerberos5=${kerberos}") ++ optional stdenv.isDarwin "--disable-libutil" ++ optional (!linkOpenssl) "--without-openssl"; diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix index 28b1c961a3ff..71d1e6fa6d6e 100644 --- a/pkgs/tools/networking/pcapc/default.nix +++ b/pkgs/tools/networking/pcapc/default.nix @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { description = "Compile libpcap filter expressions into BPF opcodes"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix index 484eab3a221c..8fb9b066bf1c 100644 --- a/pkgs/tools/networking/pingtcp/default.nix +++ b/pkgs/tools/networking/pingtcp/default.nix @@ -26,6 +26,5 @@ stdenv.mkDerivation rec { homepage = https://github.com/LanetNetwork/pingtcp; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ nckx ]; }; } diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index 97780d546e43..a0bac7854c1d 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchFromGitHub, python2Packages, writeText, writeScript +{ stdenv, fetchFromGitHub, python3Packages, writeText, writeScript , coreutils, sqlite }: +with python3Packages; + let dbSql = writeText "create_pykms_db.sql" '' CREATE TABLE clients( @@ -27,21 +29,21 @@ let fi ''); -in python2Packages.buildPythonApplication rec { +in buildPythonApplication rec { name = "pykms-${version}"; - version = "20170719"; + version = "20171224"; src = fetchFromGitHub { owner = "ThunderEX"; repo = "py-kms"; - rev = "27355d88affd740330174a7c2bae9f50b9efce56"; - sha256 = "0cpywj73jmyijjc5hs3b00argjsdwpqzmhawbxkx3mc2l4sgzc88"; + rev = "885f67904f002042d7758e38f9c5426461c5cdc7"; + sha256 = "155khy1285f8xkzi6bsqm9vzz043jsjmp039va1qsh675gz3q9ha"; }; - propagatedBuildInputs = with python2Packages; [ argparse pytz ]; + propagatedBuildInputs = [ argparse pytz ]; prePatch = '' - siteDir=$out/${python2Packages.python.sitePackages} + siteDir=$out/${python.sitePackages} substituteInPlace kmsBase.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" @@ -60,7 +62,7 @@ in python2Packages.buildPythonApplication rec { mv * $siteDir for b in client server ; do chmod 0755 $siteDir/$b.py - makeWrapper ${python2Packages.python.interpreter} $out/bin/$b.py \ + makeWrapper ${python.interpreter} $out/bin/$b.py \ --add-flags $siteDir/$b.py done @@ -68,7 +70,7 @@ in python2Packages.buildPythonApplication rec { mv $siteDir/README.md $out/share/doc/pykms/ - ${python2Packages.python.interpreter} -m compileall $siteDir + ${python.interpreter} -m compileall $siteDir runHook postInstall ''; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index c188dd477fe1..93fc28b48bf2 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.2"; + name = "siege-4.0.4"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "0ivc6ah9n2888qgh8dicszhr3mjs42538lfx7dlhxvvvakwq3yvy"; + sha256 = "0vzaj5nzb0fir2a4l7ghv3wa5d1nk2ss8gmwjb6bjavjplccyzcg"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index deac37468360..0d328c02d371 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -5,8 +5,10 @@ stdenv.mkDerivation rec { version = "5.44"; src = fetchurl { - url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1692y69wl7j6yjgnrrzclgzb34bxsaxjzl1dfy47vms7pdfk42lr"; + url = "https://www.stunnel.org/downloads/${name}.tar.gz"; + sha256 = "990a325dbb47d77d88772dd02fbbd27d91b1fea3ece76c9ff4461eca93f12299"; + # please use the contents of "https://www.stunnel.org/downloads/${name}.tar.gz.sha256", + # not the output of `nix-prefetch-url` }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 5c6920487b7d..324a58cf7edb 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; - maintainers = with stdenv.lib.maintainers; [ mornfall jgeerds ]; + maintainers = with stdenv.lib.maintainers; [ jgeerds ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index b124352fd7b9..614447cd5ecf 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "17qwfmlls0w9kpkya3dlpn44b3kr87wsswzg3gawc13hh8yx8ysf"; + url = "https://unbound.net/downloads/${name}.tar.gz"; + sha256 = "0jfxhh4gc5amhndikskz1s7da27ycn442j3l20bm992n7zijid73"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 6a322f649ac4..0c37043de9bb 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { name = "urlwatch-${version}"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "thp"; repo = "urlwatch"; rev = version; - sha256 = "0fx964z73yv08b1lpymmjsigf6929zx9ax5bp34rcf2c5gk11l5m"; + sha256 = "1nja7n6pc45azd3l1xyvav89855lvcgwabrvf34rps81dbl8cnl4"; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index b6bbae65e695..b31ae93066ef 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -5,11 +5,11 @@ , openssl ? null }: stdenv.mkDerivation rec { - name = "wget-1.19.2"; + name = "wget-1.19.4"; src = fetchurl { url = "mirror://gnu/wget/${name}.tar.lz"; - sha256 = "01yzal7xm85543x02bij3capnigr063d6c5vc039f8n5s9d796nm"; + sha256 = "16jmcqcasx3q9k4azssryli9qyxfq0sfijw998g8zp58cnwzzh1g"; }; patches = [ diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix index 30ecf617873a..6f37e88f4f6d 100644 --- a/pkgs/tools/networking/whois/default.nix +++ b/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, perl, gettext, pkgconfig, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.2.20"; + version = "5.3.0"; name = "whois-${version}"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "1aamasivfnghr9my1j6c1rf0dfal45axjcjf3mpv0g942bkxqp5b"; + sha256 = "01pfl1ap62hc27574sx1a4yaaf7hr2zkksspn5z97sgacl6h1rnf"; }; nativeBuildInputs = [ perl gettext pkgconfig ]; |