diff options
Diffstat (limited to 'pkgs/tools/networking')
20 files changed, 66 insertions, 44 deletions
diff --git a/pkgs/tools/networking/airfield/node.nix b/pkgs/tools/networking/airfield/node.nix index e306e49c849..055fc5267c3 100644 --- a/pkgs/tools/networking/airfield/node.nix +++ b/pkgs/tools/networking/airfield/node.nix @@ -6,7 +6,7 @@ let nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; + inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile; inherit nodejs; libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; }; diff --git a/pkgs/tools/networking/bud/default.nix b/pkgs/tools/networking/bud/default.nix index a79cbdc8bbd..724d25d49f9 100644 --- a/pkgs/tools/networking/bud/default.nix +++ b/pkgs/tools/networking/bud/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchgit, python, gyp, utillinux }: +{ stdenv, lib, fetchgit, python, gyp, util-linux }: stdenv.mkDerivation { pname = "bud"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python gyp - ] ++ lib.optional stdenv.isLinux utillinux; + ] ++ lib.optional stdenv.isLinux util-linux; buildPhase = '' python ./gyp_bud -f make diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 438f107c27c..28a418c27f2 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, util-linux, nixosTests }: stdenv.mkDerivation rec { pname = "cjdns"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ which python27 nodejs ] ++ # for flock - stdenv.lib.optional stdenv.isLinux utillinux; + stdenv.lib.optional stdenv.isLinux util-linux; CFLAGS = "-O2 -Wno-error=stringop-truncation"; buildPhase = diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index 9add729cf2f..edf91dd311d 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hey"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "rakyll"; repo = pname; rev = "v${version}"; - sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; + sha256 = "0gsdksrzlwpba14a43ayyy41l1hxpw4ayjpvqyd4ycakddlkvgzb"; }; vendorSha256 = null; diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix index 29bd4c331eb..e9987a51eae 100644 --- a/pkgs/tools/networking/httpstat/default.nix +++ b/pkgs/tools/networking/httpstat/default.nix @@ -2,12 +2,12 @@ pythonPackages.buildPythonApplication rec { pname = "httpstat"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "reorx"; repo = pname; rev = version; - sha256 = "1vriibcsq4j1hvm5yigbbmmv21dc40y5c9gvd31dg9qkaz26hml6"; + sha256 = "18k2glnyzxlmry19ijmndim2vqqn3c86smd7xc3haw6k7qafifx1"; }; doCheck = false; # No tests buildInputs = [ glibcLocales ]; diff --git a/pkgs/tools/networking/igmpproxy/default.nix b/pkgs/tools/networking/igmpproxy/default.nix new file mode 100644 index 00000000000..83b35c09866 --- /dev/null +++ b/pkgs/tools/networking/igmpproxy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "igmpproxy"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "pali"; + repo = "igmpproxy"; + rev = version; + sha256 = "13zn4q24drbhpqmcmqh1jg7ind5iqn11wj3xvczlc8w35vyqssyf"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + meta = with stdenv.lib; { + description = "A daemon that routes multicast using IGMP forwarding"; + homepage = "https://github.com/pali/igmpproxy/"; + changelog = "https://github.com/pali/igmpproxy/releases/tag/${version}"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.sdier ]; + # The maintainer is using this on linux, but if you test it on other platforms + # please add them here! + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 2a551c56768..f01bffa76da 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://troglobit.com/project/inadyn/"; + homepage = "https://troglobit.com/project/inadyn/"; description = "Free dynamic DNS client"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 26c9035cd79..dba75400f6f 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -3,10 +3,11 @@ , libutempter ? null, withUtempter ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "mosh-1.3.2"; + pname = "mosh"; + version = "1.3.2"; src = fetchurl { - url = "https://mosh.org/${name}.tar.gz"; + url = "https://mosh.org/mosh-${version}.tar.gz"; sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; diff --git a/pkgs/tools/networking/openapi-generator-cli/default.nix b/pkgs/tools/networking/openapi-generator-cli/default.nix index 2b09fe901d0..4630342cf8a 100644 --- a/pkgs/tools/networking/openapi-generator-cli/default.nix +++ b/pkgs/tools/networking/openapi-generator-cli/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.3.1"; pname = "openapi-generator-cli"; jarfilename = "${pname}-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/org/openapitools/${pname}/${version}/${jarfilename}"; - sha256 = "1pafv432ll3pp52580pbnk0gnrm6byl5fkrf1rarhxfkpkr82yif"; + sha256 = "1h9infspwbij9ahb376vc4ijakrqb7xww573ccrqvchxphbcsf7l"; }; phases = [ "installPhase" ]; @@ -31,4 +31,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.shou ]; }; } - diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 0a1680bfdb5..a8ce80f9838 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - sha256 = "1r9lp19fmqx9dw33j5967ydijbnacmr80mqnhbbxyqiw4k5c10ds"; + sha256 = "1qsfgpxg553s8rc9cyrc4k96z0pislxsdxb9wyhp8fdprkak2mw2"; }; # we cannot write the config file to /etc and as we don't need the file, so drop it diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index ac40ad3f1fb..f8a518ca4dc 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { src = if hpnSupport then fetchurl { url = "https://github.com/rapier1/openssh-portable/archive/hpn-KitchenSink-${replaceStrings [ "." "p" ] [ "_" "_P" ] version}.tar.gz"; - sha256 = "06mr2q8d9kbj145r7mzmpm3a4ilnssibwlbjyy0bjsqrqnrll3zl"; + sha256 = "1x2afjy1isslbg7qlvhhs4zhj2c8q2h1ljz0fc5b4h9pqcm9j540"; } else fetchurl { diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 1df6260a09c..04ac9700310 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -9,7 +9,7 @@ , pam , useSystemd ? stdenv.isLinux , systemd ? null -, utillinux ? null +, util-linux ? null , pkcs11Support ? false , pkcs11helper ? null }: @@ -63,7 +63,7 @@ let '' + optionalString useSystemd '' install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved wrapProgram $out/libexec/update-systemd-resolved \ - --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]} + --prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]} ''; enableParallelBuilding = true; diff --git a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix index d73b8e911b9..f50d17eaf7d 100644 --- a/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix +++ b/pkgs/tools/networking/openvpn/openvpn_learnaddress.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }: +{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }: stdenv.mkDerivation { name = "openvpn-learnaddress-19b03c3"; @@ -9,13 +9,13 @@ stdenv.mkDerivation { sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42"; }; - buildInputs = [ makeWrapper coreutils gawk utillinux ]; + buildInputs = [ makeWrapper coreutils gawk util-linux ]; installPhase = '' install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress wrapProgram $out/libexec/openvpn/openvpn-learnaddress \ - --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]} + --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]} ''; meta = { diff --git a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix index 4d18372363b..1a192ce6688 100644 --- a/pkgs/tools/networking/openvpn/update-systemd-resolved.nix +++ b/pkgs/tools/networking/openvpn/update-systemd-resolved.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub , makeWrapper -, iproute, systemd, coreutils, utillinux }: +, iproute, systemd, coreutils, util-linux }: stdenv.mkDerivation rec { pname = "update-systemd-resolved"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { installPhase = '' wrapProgram $out/libexec/openvpn/update-systemd-resolved \ - --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]} + --prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]} ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/pdsh/default.nix b/pkgs/tools/networking/pdsh/default.nix index 9dd1a5581c5..3f00964bfd3 100644 --- a/pkgs/tools/networking/pdsh/default.nix +++ b/pkgs/tools/networking/pdsh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, readline, rsh, ssh }: +{ stdenv, fetchurl, perl, readline, rsh, ssh, slurm, slurmSupport ? false }: stdenv.mkDerivation rec { name = "pdsh-2.34"; @@ -8,7 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1s91hmhrz7rfb6h3l5k97s393rcm1ww3svp8dx5z8vkkc933wyxl"; }; - buildInputs = [ perl readline ssh ]; + buildInputs = [ perl readline ssh ] + ++ (stdenv.lib.optional slurmSupport slurm); preConfigure = '' configureFlagsArray=( @@ -18,6 +19,7 @@ stdenv.mkDerivation rec { ${if readline == null then "--without-readline" else "--with-readline"} ${if ssh == null then "--without-ssh" else "--with-ssh"} ${if rsh == false then "--without-rsh" else "--with-rsh"} + ${if slurmSupport then "--with-slurm" else "--without-slurm"} "--with-dshgroups" "--with-xcpu" "--disable-debug" diff --git a/pkgs/tools/networking/shorewall/default.nix b/pkgs/tools/networking/shorewall/default.nix index 67f81b82105..c56f0eac7ff 100644 --- a/pkgs/tools/networking/shorewall/default.nix +++ b/pkgs/tools/networking/shorewall/default.nix @@ -10,7 +10,7 @@ , perlPackages , stdenv , tree -, utillinux +, util-linux }: let PATH = stdenv.lib.concatStringsSep ":" @@ -19,7 +19,7 @@ let "${iptables}/bin" "${ipset}/bin" "${ebtables}/bin" - "${utillinux}/bin" + "${util-linux}/bin" "${gnugrep}/bin" "${gnused}/bin" ]; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { ipset iptables ebtables - utillinux + util-linux gnugrep gnused perl diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 39b361bd302..143b25849de 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr"; + sha256 = "1zvmsin7pgfwafj5qr8fcixg01xfq1xhjd93klyxhmacfxirhkgw"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/pkgs/tools/networking/telepresence/default.nix b/pkgs/tools/networking/telepresence/default.nix index 285a3764e03..a077ddb3de4 100644 --- a/pkgs/tools/networking/telepresence/default.nix +++ b/pkgs/tools/networking/telepresence/default.nix @@ -3,7 +3,7 @@ , iptables, bash }: let - sshuttle-telepresence = + sshuttle-telepresence = let sshuttleTelepresenceRev = "32226ff14d98d58ccad2a699e10cdfa5d86d6269"; in @@ -22,13 +22,13 @@ let }); in pythonPackages.buildPythonPackage rec { pname = "telepresence"; - version = "0.105"; + version = "0.108"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = version; - sha256 = "0fccbd54ryd9rcbhfh5lx8qcc3kx3k9jads918rwnzwllqzjf7sg"; + sha256 = "6V0sM0Z+2xNDgL0wIzJOdaUp2Ol4ejNTk9K/pllVa7g="; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index 478c1ed35f2..d9d8478e985 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, libxslt, libaio, systemd, perl, perlPackages -, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, utillinux +, docbook_xsl, coreutils, lsof, rdma-core, makeWrapper, sg3_utils, util-linux }: stdenv.mkDerivation rec { diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 666b30d2c8e..9d254a05510 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -2,22 +2,16 @@ stdenv.mkDerivation rec { pname = "zerotierone"; - version = "1.4.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "zerotier"; repo = "ZeroTierOne"; rev = version; - sha256 = "1f8hh05wx59dc0fbzdzwq05x0gmrdfl4v103wbcyjmzsbazaw6p3"; + sha256 = "0zk1lvjramahjpq94axdic8sgvvmgyg1fmcb89lynqqvh66qsv12"; }; preConfigure = '' - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/usr/sbin/ip' '${iproute}/bin/ip' - - substituteInPlace ./osdep/ManagedRoute.cpp \ - --replace '/sbin/ip' '${iproute}/bin/ip' - patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ |