diff options
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/chrony/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/iperf/3.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/ntp/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/nyx/default.nix | 25 | ||||
-rw-r--r-- | pkgs/tools/networking/telepresence/default.nix | 36 | ||||
-rw-r--r-- | pkgs/tools/networking/unbound/python.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/xl2tpd/default.nix | 4 |
7 files changed, 64 insertions, 19 deletions
diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 27f5ca2c7dd1..2db26985dcf9 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libcap, readline, texinfo, nss, nspr -, libseccomp }: +, libseccomp, pps-tools }: assert stdenv.isLinux -> libcap != null; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ readline texinfo nss nspr ] - ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libcap libseccomp pps-tools ]; nativeBuildInputs = [ pkgconfig ]; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/tools/networking/iperf/3.nix index ed6ca57f3da8..86ee7578bb67 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/tools/networking/iperf/3.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, fetchpatch }: stdenv.mkDerivation rec { - name = "iperf-3.5"; + name = "iperf-3.6"; src = fetchurl { url = "https://downloads.es.net/pub/iperf/${name}.tar.gz"; - sha256 = "1m9cyycv70s8nlbgr1lqwr155ixk17np0nzqgwaw3f51vkndk6sk"; + sha256 = "0vllfmyqiy6nxgbagsx1zrs4pmfawyalzm5l1xcwqq64dpj52pfy"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 6e566d3c4739..467b17e468a2 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null }: +{ stdenv, lib, fetchurl, openssl, perl, libcap ? null, libseccomp ? null, pps-tools }: assert stdenv.isLinux -> libcap != null; assert stdenv.isLinux -> libseccomp != null; @@ -28,7 +28,9 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isLinux "--enable-linuxcaps" ++ stdenv.lib.optional withSeccomp "--enable-libseccomp"; - buildInputs = [ libcap openssl perl ] ++ lib.optional withSeccomp libseccomp; + buildInputs = [ libcap openssl perl ] + ++ lib.optional withSeccomp libseccomp + ++ lib.optional stdenv.isLinux pps-tools; hardeningEnable = [ "pie" ]; diff --git a/pkgs/tools/networking/nyx/default.nix b/pkgs/tools/networking/nyx/default.nix new file mode 100644 index 000000000000..3476e56993bf --- /dev/null +++ b/pkgs/tools/networking/nyx/default.nix @@ -0,0 +1,25 @@ +{ lib, pythonPackages }: + +with pythonPackages; + +buildPythonApplication rec { + pname = "nyx"; + version = "2.0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "0pm7vfcqr02pzqz4b2f6sw5prxxmgqwr1912am42xmy2i53n7nrq"; + }; + + propagatedBuildInputs = [ stem ]; + + # ./run_tests.py returns `TypeError: testFailure() takes exactly 1 argument` + doCheck = false; + + meta = with lib; { + description = "Command-line monitor for Tor"; + homepage = https://nyx.torproject.org/; + license = licenses.gpl3; + maintainers = with maintainers; [ offline ]; + }; +} diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index bbdaed4ccc04..54d54a76fcb3 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -1,12 +1,13 @@ { lib, stdenv, fetchgit, fetchFromGitHub, makeWrapper, git -, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools }: +, python3, sshfs-fuse, torsocks, sshuttle, conntrack-tools +, openssh, which, coreutils, iptables, bash }: let sshuttle-telepresence = lib.overrideDerivation sshuttle (p: { src = fetchgit { url = "https://github.com/datawire/sshuttle.git"; - rev = "8f881d131a0d5cb203c5a530d233996077f1da1e"; - sha256 = "0c760xhblz5mpcn5ddqpvivvgn0ixqbhpjsy50dkhgn6lymrx9bx"; + rev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; + sha256 = "1q20lnljndwcpgqv2qrf1k0lbvxppxf98a4g5r9zd566znhcdhx3"; leaveDotGit = true; }; @@ -16,26 +17,43 @@ let }); in stdenv.mkDerivation rec { pname = "telepresence"; - version = "0.67"; + version = "0.85"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "datawire"; repo = "telepresence"; rev = version; - sha256 = "1bpyzgvrf43yvhwp5bzkp2qf3z9dhjma165w8ssca9g00v4b5vg9"; + sha256 = "1iypqrx9pnhaz3p5bvl6g0c0c3d1799dv0xdjrzc1z5wa8diawvj"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper python3 ]; phases = ["unpackPhase" "installPhase"]; installPhase = '' mkdir -p $out/libexec $out/bin - cp cli/telepresence $out/libexec/telepresence - makeWrapper $out/libexec/telepresence $out/bin/telepresence \ - --prefix PATH : ${lib.makeBinPath [python3 sshfs-fuse torsocks conntrack-tools sshuttle-telepresence]} + export PREFIX=$out + substituteInPlace ./install.sh \ + --replace "#!/bin/bash" "#!${stdenv.shell}" \ + --replace '"''${VENVDIR}/bin/pip" -q install "git+https://github.com/datawire/sshuttle.git@telepresence"' "" \ + --replace '"''${VENVDIR}/bin/sshuttle-telepresence"' '"${sshuttle-telepresence}/bin/sshuttle-telepresence"' + ./install.sh + + wrapProgram $out/bin/telepresence \ + --prefix PATH : ${lib.makeBinPath [ + python3 + sshfs-fuse + torsocks + conntrack-tools + sshuttle-telepresence + openssh + which + coreutils + iptables + bash + ]} ''; meta = { diff --git a/pkgs/tools/networking/unbound/python.nix b/pkgs/tools/networking/unbound/python.nix index 911afdd18bb0..67e6f2e9c43f 100644 --- a/pkgs/tools/networking/unbound/python.nix +++ b/pkgs/tools/networking/unbound/python.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "pyunbound"; name = "${pname}-${version}"; - version = "1.6.0"; + version = "1.7.3"; src = fetchurl { url = "http://unbound.net/downloads/unbound-${version}.tar.gz"; - sha256 = "1dzsxyp34ianp08wk4vf13qzl5ss5rr9v1p8zr1aggfywrsbhzbb"; + sha256 = "0bb0p8nbda77ghx20yfl7hqxm9x709223q35465v99i8v4ay27f1"; }; buildInputs = [ openssl expat libevent swig python ]; diff --git a/pkgs/tools/networking/xl2tpd/default.nix b/pkgs/tools/networking/xl2tpd/default.nix index f34b01fb484a..d86b1613a9a3 100644 --- a/pkgs/tools/networking/xl2tpd/default.nix +++ b/pkgs/tools/networking/xl2tpd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "xl2tpd-${version}"; - version = "1.3.10.1"; + version = "1.3.12"; src = fetchFromGitHub { owner = "xelerance"; repo = "xl2tpd"; rev = "v${version}"; - sha256 = "0rz31bcjl7na89abn9bj5p3dbgqd6q6xsympzki15axxhyy57qan"; + sha256 = "0slza1v8qligy8c83j0x3jzb85m9ibjxyyvpwsykrkypav8a6ii1"; }; buildInputs = [ libpcap ]; |