From 69e173dad1bab16276cdc1b23f0f66b027072f5d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 3 Jul 2018 07:10:39 -0700 Subject: xl2tpd: 1.3.10.1 -> 1.3.12 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/xl2tpd/versions. These checks were done: - built on NixOS - /nix/store/xvvr6zvnn8q3k0021bp74yfql82yp7q1-xl2tpd-1.3.12/bin/pfc passed the binary check. - /nix/store/xvvr6zvnn8q3k0021bp74yfql82yp7q1-xl2tpd-1.3.12/bin/xl2tpd passed the binary check. - /nix/store/xvvr6zvnn8q3k0021bp74yfql82yp7q1-xl2tpd-1.3.12/bin/xl2tpd-control passed the binary check. - 2 of 3 passed binary check by having a zero exit code. - 1 of 3 passed binary check by having the new version present in output. - found 1.3.12 with grep in /nix/store/xvvr6zvnn8q3k0021bp74yfql82yp7q1-xl2tpd-1.3.12 - directory tree listing: https://gist.github.com/9e7e06daf4d57291dbefde0aff0da546 - du listing: https://gist.github.com/0eb400f5c7f43510ed9dc63f43181d95 --- pkgs/tools/networking/xl2tpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking') 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 ]; -- cgit 1.4.1 From 91575dd285efcd75d7e09a94ef619bf4a6bc4bd2 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Wed, 4 Jul 2018 13:28:07 +0200 Subject: pps-tools: init at 1.0.2, enable for chrony, gpsd, ntp (#42889) --- pkgs/os-specific/linux/pps-tools/default.nix | 34 +++++++++++++++++++++++++++ pkgs/servers/gpsd/0002-scons-envs-patch.patch | 11 +++++++++ pkgs/servers/gpsd/default.nix | 17 ++++++++++---- pkgs/tools/networking/chrony/default.nix | 4 ++-- pkgs/tools/networking/ntp/default.nix | 6 +++-- pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 pkgs/os-specific/linux/pps-tools/default.nix create mode 100644 pkgs/servers/gpsd/0002-scons-envs-patch.patch (limited to 'pkgs/tools/networking') diff --git a/pkgs/os-specific/linux/pps-tools/default.nix b/pkgs/os-specific/linux/pps-tools/default.nix new file mode 100644 index 000000000000..e4f7d4b3616e --- /dev/null +++ b/pkgs/os-specific/linux/pps-tools/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + baseName = "pps-tools"; + version = "1.0.2"; + name = "${baseName}-${version}"; + + src = fetchFromGitHub { + owner = "redlab-i"; + repo = "${baseName}"; + rev = "v${version}"; + sha256 = "1yh9g0l59dkq4ci0wbb03qin3c3cizfngmn9jy1vwm5zm6axlxhf"; + }; + + outputs = [ "out" "dev" ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $dev/include + mkdir -p $out/{usr/bin,usr/include/sys} + make install DESTDIR=$out + mv $out/usr/bin/* $out/bin + mv $out/usr/include/* $dev/include/ + rm -rf $out/usr/ + ''; + + meta = with stdenv.lib;{ + description = "User-space tools for LinuxPPS"; + homepage = http://linuxpps.org/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ sorki ]; + }; +} diff --git a/pkgs/servers/gpsd/0002-scons-envs-patch.patch b/pkgs/servers/gpsd/0002-scons-envs-patch.patch new file mode 100644 index 000000000000..fbb06db6aa39 --- /dev/null +++ b/pkgs/servers/gpsd/0002-scons-envs-patch.patch @@ -0,0 +1,11 @@ +--- b/SConstruct 2018-07-03 23:13:51.986746857 +0200 ++++ a/SConstruct 2018-07-03 23:14:50.495252914 +0200 +@@ -221,7 +221,7 @@ + 'STAGING_PREFIX', # Required by the OpenWRT and CeroWrt builds. + 'WRITE_PAD', # So we can test WRITE_PAD values on the fly. + ) +-envs = {} ++envs = os.environ + for var in import_env: + if var in os.environ: + envs[var] = os.environ[var] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 911f3b23f0c1..6e270192063b 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -2,6 +2,7 @@ , ncurses, libX11, libXt, libXpm, libXaw, libXext , libusb1, docbook_xml_dtd_412, docbook_xsl, bc , libxslt, xmlto, gpsdUser ? "gpsd", gpsdGroup ? "dialout" +, pps-tools , python2Packages }: @@ -23,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ python2Packages.python dbus dbus-glib ncurses libX11 libXt libXpm libXaw libXext - libxslt libusb1 + libxslt libusb1 pps-tools ]; pythonPath = [ @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { # TODO: remove the patch with the next release ./0001-Use-pkgconfig-for-dbus-library.patch + # to be able to find pps-tools + ./0002-scons-envs-patch.patch ]; # - leapfetch=no disables going online at build time to fetch leap-seconds @@ -44,9 +47,15 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . sed -e "s|systemd_dir = .*|systemd_dir = '$out/lib/systemd/system'|" -i SConstruct - scons prefix="$out" leapfetch=no gpsd_user=${gpsdUser} gpsd_group=${gpsdGroup} \ - systemd=yes udevdir="$out/lib/udev" \ - python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" + scons \ + -j $NIX_BUILD_CORES \ + prefix="$out" \ + leapfetch=no \ + gpsd_user=${gpsdUser} \ + gpsd_group=${gpsdGroup} \ + systemd=yes \ + udevdir="$out/lib/udev" \ + python_libdir="$out/lib/${python2Packages.python.libPrefix}/site-packages" ''; checkPhase = '' 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/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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31eba454ec7d..62a769888e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14202,6 +14202,8 @@ with pkgs; powertop = callPackage ../os-specific/linux/powertop { }; + pps-tools = callPackage ../os-specific/linux/pps-tools { }; + prayer = callPackage ../servers/prayer { }; procps-ng = if stdenv.isLinux then callPackage ../os-specific/linux/procps-ng { } -- cgit 1.4.1 From 9d460f005173a5e3fc78342022bc234fa47bea18 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Jul 2018 07:28:02 -0700 Subject: python27Packages.pyunbound: 1.6.0 -> 1.7.3 (#42952) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/pyunbound/versions. These checks were done: - built on NixOS - 0 of 0 passed binary check by having a zero exit code. - 0 of 0 passed binary check by having the new version present in output. - found 1.7.3 with grep in /nix/store/1m9fiqaz72ry8jkwgw52v3wv1n5pgx0l-pyunbound-1.7.3 - directory tree listing: https://gist.github.com/2a7b7a3d8411e63dec56620537e2d00f - du listing: https://gist.github.com/82633a34688c0630480a740b7562ac4c --- pkgs/tools/networking/unbound/python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking') 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 ]; -- cgit 1.4.1 From 28817750a733fc70a3d519d8fcf4e505623ce677 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Jul 2018 07:40:35 -0700 Subject: iperf: 3.5 -> 3.6 (#43002) --- pkgs/tools/networking/iperf/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/networking') 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 ]; -- cgit 1.4.1 From 42f1372c53f0ea7ae465451b37b9039279ed3b7b Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 6 Jul 2018 19:23:43 +0200 Subject: telepresence: 0.67 -> 0.85 (#43116) --- pkgs/tools/networking/telepresence/default.nix | 36 +++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) (limited to 'pkgs/tools/networking') 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 = { -- cgit 1.4.1 From 499203e19934601b95a81f8c62aa418b2bbf16c4 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 7 Jul 2018 17:03:20 +0200 Subject: nyx: init at 2.0.4 (#43139) --- pkgs/tools/networking/nyx/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/networking/nyx/default.nix (limited to 'pkgs/tools/networking') 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7084b0a5fd2..503ba82c782e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1391,6 +1391,8 @@ with pkgs; nwipe = callPackage ../tools/security/nwipe { }; + nyx = callPackage ../tools/networking/nyx { }; + onboard = callPackage ../applications/misc/onboard { }; optar = callPackage ../tools/graphics/optar {}; -- cgit 1.4.1