diff options
Diffstat (limited to 'pkgs/tools/networking')
25 files changed, 112 insertions, 115 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index d16e730b5abf..817da08c05e3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { stdenv.lib.optional stdenv.isLinux utillinux; buildPhase = - stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 " + stdenv.lib.optionalString stdenv.isAarch32 "Seccomp_NO=1 " + "bash do"; installPhase = '' install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6 diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 387987c588ad..f7a0c00fb481 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jcumming ]; }; } diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix index b33034515fb6..3c6c5f3d2992 100644 --- a/pkgs/tools/networking/easyrsa/2.x.nix +++ b/pkgs/tools/networking/easyrsa/2.x.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix index 59d97a4a18b6..fcc6c1d86bdf 100644 --- a/pkgs/tools/networking/easyrsa/default.nix +++ b/pkgs/tools/networking/easyrsa/default.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Simple shell based CA utility"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; license = licenses.gpl2; maintainers = [ maintainers.offline ]; platforms = platforms.linux; diff --git a/pkgs/tools/networking/filegive/default.nix b/pkgs/tools/networking/filegive/default.nix index d20cb3c37859..6fef6a9e7fa9 100644 --- a/pkgs/tools/networking/filegive/default.nix +++ b/pkgs/tools/networking/filegive/default.nix @@ -1,7 +1,5 @@ { stdenv, fetchurl, fetchgit, go }: -assert stdenv.isLinux && (stdenv.isi686 || stdenv.isx86_64 || stdenv.isArm); - let # Code with BSD license diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index c5ecb5eb6dad..c050758a8ee3 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, perl, help2man }: +{ stdenv, lib, fetchurl, ncurses, perl, help2man }: stdenv.mkDerivation rec { name = "inetutils-1.9.4"; @@ -16,25 +16,20 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses /* for `talk' */ perl /* for `whois' */ help2man ]; configureFlags = [ "--with-ncurses-include-dir=${ncurses.dev}/include" ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd + ++ lib.optionals stdenv.hostPlatform.isMusl [ # Musl doesn't define rcmd "--disable-rcp" "--disable-rsh" "--disable-rlogin" "--disable-rexec" - ]; + ] ++ lib.optional stdenv.isDarwin "--disable-servers"; # Test fails with "UNIX socket name too long", probably because our # $TMPDIR is too long. - #doCheck = true; - + doCheck = false; - postInstall = '' - # XXX: These programs are normally installed setuid but since it - # fails, they end up being non-executable, hence this hack. - chmod +x $out/bin/{ping,ping6,${stdenv.lib.optionalString (!stdenv.hostPlatform.isMusl) ''rcp,rlogin,rsh,''}traceroute} - ''; + installFlags = [ "SUIDMODE=" ]; - meta = { + meta = with lib; { description = "Collection of common network programs"; longDescription = @@ -45,9 +40,9 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/inetutils/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; + maintainers = with maintainers; [ matthewbauer ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/networking/jwhois/default.nix b/pkgs/tools/networking/jwhois/default.nix index cd0821ef9ef5..be8e9e210d15 100644 --- a/pkgs/tools/networking/jwhois/default.nix +++ b/pkgs/tools/networking/jwhois/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { 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/; - license = "GPL"; - platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/logmein-hamachi/default.nix b/pkgs/tools/networking/logmein-hamachi/default.nix index bbee6546b2f4..0b585d10316c 100644 --- a/pkgs/tools/networking/logmein-hamachi/default.nix +++ b/pkgs/tools/networking/logmein-hamachi/default.nix @@ -2,8 +2,6 @@ with stdenv.lib; -assert stdenv.isLinux; - let arch = if stdenv.system == "x86_64-linux" then "x64" diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 26bfd27bf9a6..4df7f80fff6c 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -116,6 +116,6 @@ in stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/mailutils/; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 129db56dc554..3a1bba4ce8c1 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -1,13 +1,11 @@ { stdenv, fetchurl, iptables, libuuid, pkgconfig }: -assert stdenv.isLinux; - stdenv.mkDerivation rec { - name = "miniupnpd-2.0.20180410"; + name = "miniupnpd-2.0.20180422"; src = fetchurl { url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz"; - sha256 = "1w4crmsmrygagh0v9phx8aicbyh6nypfjh2fdmknijngvx05biaq"; + sha256 = "03g9r519p127sj6rl2x535022bwj8vzvdwp4385v7vnjrd4dswzy"; name = "${name}.tar.gz"; }; diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix deleted file mode 100644 index 2d9776abfcfc..000000000000 --- a/pkgs/tools/networking/netcat-openbsd/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{stdenv, fetchurl, fetchpatch, pkgconfig, libbsd}: - -stdenv.mkDerivation rec { - 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 = "0sxsxl7n7hnxz931jqsp86cdwiq2lm4h3w0i2a67935pki924gxw"; - }) - (fetchurl { - url = "mirror://debian/pool/main/n/netcat-openbsd/netcat-openbsd_${deb-version}.debian.tar.xz"; - sha256 = "0jwbdis6avxdjzg8bcab1bdz296rkzzkdlv50fr3q0277fxjs49q"; - }) - ]; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ]; - - sourceRoot = name; - - prePatch = '' - for i in $(cat ../debian/patches/series); do - patch -p1 < "../debian/patches/$i" - done - ''; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://gitweb.gentoo.org/proj/musl.git/plain/net-analyzer/openbsd-netcat/files/openbsd-netcat-1.105-b64_ntop.patch?id=4a5864922232c7df550c21f2a7b77fe6f8ffc6d6"; - sha256 = "1cgqb6fxas5yiwf26hq57v627hhmcskl5j6rx30090ha2ksjqyvr"; - }) - ]; - - 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; { - homepage = https://packages.debian.org/netcat-openbsd; - description = "TCP/IP swiss army knife, OpenBSD variant"; - platforms = platforms.linux; - maintainers = with maintainers; [ willibutz ]; - }; - -} diff --git a/pkgs/tools/networking/netcat-gnu/default.nix b/pkgs/tools/networking/netcat/default.nix index 47ec804e5d48..47ec804e5d48 100644 --- a/pkgs/tools/networking/netcat-gnu/default.nix +++ b/pkgs/tools/networking/netcat/default.nix diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix index b3d4ec95e061..9f83949e8de0 100644 --- a/pkgs/tools/networking/nss-mdns/default.nix +++ b/pkgs/tools/networking/nss-mdns/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv }: +{ fetchurl, stdenv, fetchpatch }: stdenv.mkDerivation rec { name = "nss-mdns-0.10"; @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ]; + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl + ( + fetchpatch + { + url = "https://raw.githubusercontent.com/openembedded/openembedded-core/94f780e889f194b67a48587ac68b3200288bee10/meta/recipes-connectivity/libnss-mdns/libnss-mdns/0001-check-for-nss.h.patch"; + sha256 = "1l1kjbdw8z31br4vib3l5b85jy7kxin760a2f24lww8v6lqdpgds"; + } + ); + + meta = { description = "The mDNS Name Service Switch (NSS) plug-in"; longDescription = '' @@ -34,7 +44,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; # Supports both the GNU and FreeBSD NSS. - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux ++ stdenv.lib.platforms.freebsd; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6eafdde10824..b265cdb4c326 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.6.0"; + version = "1.7.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192"; + sha256 = "1qfz5igry7fhrkz5iyzqpffldhpdvcw98k06yb6acwc1jyv87nh0"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 31fccbffa790..358c53f453bb 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openvpn-${version}"; - version = "2.4.5"; + version = "2.4.6"; src = fetchurl { - url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz"; - sha256 = "17njq59hsraqyxrbhkrxr7dvx0p066s3pn8w1mi0yd9jldis7h23"; + url = "https://swupdate.openvpn.net/community/releases/${name}.tar.xz"; + sha256 = "09lck4wmkas3iyrzaspin9gn3wiclqb1m9sf8diy7j8wakx38r2g"; }; nativeBuildInputs = [ pkgconfig ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = { description = "A robust and highly flexible tunneling application"; - homepage = http://openvpn.net/; + homepage = https://openvpn.net/; downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; diff --git a/pkgs/tools/networking/p2p/amule/default.nix b/pkgs/tools/networking/p2p/amule/default.nix index c278cc989357..ac440fc6d338 100644 --- a/pkgs/tools/networking/p2p/amule/default.nix +++ b/pkgs/tools/networking/p2p/amule/default.nix @@ -65,7 +65,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice maintainers = [ stdenv.lib.maintainers.phreedom ]; }; } diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix index f11c0a63b07e..2a89e419b2e4 100644 --- a/pkgs/tools/networking/p2p/seeks/default.nix +++ b/pkgs/tools/networking/p2p/seeks/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.matejc ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; # arbitrary choice broken = true; # 2018-04-11 }; } diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index 8c0c4a6c5664..c682100b4384 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -89,6 +89,6 @@ pythonPackages.buildPythonApplication rec { homepage = http://tahoe-lafs.org/; license = [ lib.licenses.gpl2Plus /* or */ "TGPPLv1+" ]; maintainers = with lib.maintainers; [ MostAwesomeDude ]; - platforms = lib.platforms.gnu; # arbitrary choice + platforms = lib.platforms.gnu ++ lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/pssh/default.nix b/pkgs/tools/networking/pssh/default.nix index ddaf419e5658..22c359620507 100644 --- a/pkgs/tools/networking/pssh/default.nix +++ b/pkgs/tools/networking/pssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, openssh, rsync }: pythonPackages.buildPythonApplication rec { name = "pssh-${version}"; @@ -11,6 +11,15 @@ pythonPackages.buildPythonApplication rec { sha256 = "0nawarxczfwajclnlsimhqkpzyqb1byvz9nsl54mi1bp80z5i4jq"; }; + postPatch = '' + for f in bin/*; do + substituteInPlace $f \ + --replace "'ssh'" "'${openssh}/bin/ssh'" \ + --replace "'scp'" "'${openssh}/bin/scp'" \ + --replace "'rsync'" "'${rsync}/bin/rsync'" + done + ''; + meta = with stdenv.lib; { description = "Parallel SSH Tools"; longDescription = '' diff --git a/pkgs/tools/networking/ssmtp/default.nix b/pkgs/tools/networking/ssmtp/default.nix index ceac5a58800c..031f32b53626 100644 --- a/pkgs/tools/networking/ssmtp/default.nix +++ b/pkgs/tools/networking/ssmtp/default.nix @@ -4,7 +4,7 @@ assert tlsSupport -> openssl != null; stdenv.mkDerivation { name = "ssmtp-2.64"; - + src = fetchurl { url = mirror://debian/pool/main/s/ssmtp/ssmtp_2.64.orig.tar.bz2; sha256 = "0dps8s87ag4g3jr6dk88hs9zl46h3790marc5c2qw7l71k4pvhr2"; @@ -28,7 +28,7 @@ stdenv.mkDerivation { installFlags = "etcdir=$(out)/etc"; installTargets = [ "install" "install-sendmail" ]; - + buildInputs = stdenv.lib.optional tlsSupport openssl; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index 042f8bea3d62..eb466745ef84 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -3,11 +3,15 @@ , gmp, python, iptables, ldns, unbound, openssl, pcsclite , openresolv , systemd, pam - -, enableTNC ? false, curl, trousers, sqlite, libxml2 +, curl +, enableTNC ? false, trousers, sqlite, libxml2 , enableNetworkManager ? false, networkmanager }: +# Note on curl support: If curl is built with gnutls as its backend, the +# strongswan curl plugin may break. +# See https://wiki.strongswan.org/projects/strongswan/wiki/Curl for more info. + with stdenv.lib; stdenv.mkDerivation rec { @@ -23,8 +27,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = - [ gmp python iptables ldns unbound openssl pcsclite ] - ++ optionals enableTNC [ curl trousers sqlite libxml2 ] + [ curl gmp python iptables ldns unbound openssl pcsclite ] + ++ optionals enableTNC [ trousers sqlite libxml2 ] ++ optionals stdenv.isLinux [ systemd.dev pam ] ++ optionals enableNetworkManager [ networkmanager ]; @@ -61,12 +65,12 @@ stdenv.mkDerivation rec { "--enable-eap-mschapv2" "--enable-eap-radius" "--enable-xauth-eap" "--enable-ext-auth" "--enable-forecast" "--enable-connmark" "--enable-acert" "--enable-pkcs11" "--enable-eap-sim-pcsc" "--enable-dnscert" "--enable-unbound" - "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" ] + "--enable-af-alg" "--enable-xauth-pam" "--enable-chapoly" + "--enable-curl" ] ++ optionals stdenv.isx86_64 [ "--enable-aesni" "--enable-rdrand" ] ++ optional (stdenv.system == "i686-linux") "--enable-padlock" ++ optionals enableTNC [ "--disable-gmp" "--disable-aes" "--disable-md5" "--disable-sha1" "--disable-sha2" "--disable-fips-prf" - "--enable-curl" "--enable-eap-tnc" "--enable-eap-ttls" "--enable-eap-dynamic" "--enable-tnccs-20" "--enable-tnc-imc" "--enable-imc-os" "--enable-imc-attestation" "--enable-tnc-imv" "--enable-imv-attestation" diff --git a/pkgs/tools/networking/telnet/default.nix b/pkgs/tools/networking/telnet/default.nix index 3a5117653c83..c38f3c46fa46 100644 --- a/pkgs/tools/networking/telnet/default.nix +++ b/pkgs/tools/networking/telnet/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { description = "A client and daemon for the Telnet protocol"; homepage = ftp://ftp.suse.com/pub/people/kukuk/ipv6/; license = "BSD"; - platforms = stdenv.lib.platforms.gnu; + platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c7fa1c7a2719..ccb9f3bc0d6b 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,25 +1,22 @@ { stdenv, fetchFromGitHub, cmake, nlohmann_json, -libtoxcore, libsodium, systemd, libcap, zeromq }: + libtoxcore, libsodium, libcap, zeromq, + systemd ? null }: with stdenv.lib; -let - systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; - if_systemd = optional (systemdOrNull != null); -in stdenv.mkDerivation rec { - name = "toxvpn-${version}"; - version = "2017-06-25"; +stdenv.mkDerivation rec { + name = "toxvpn-2018-04-17"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; - sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; + rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; + sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ if_systemd systemd - ++ optional (stdenv.system != "x86_64-darwin") libcap; + ++ optionals stdenv.isLinux [ libcap systemd ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; diff --git a/pkgs/tools/networking/uget-integrator/default.nix b/pkgs/tools/networking/uget-integrator/default.nix new file mode 100644 index 000000000000..cc93da7f2533 --- /dev/null +++ b/pkgs/tools/networking/uget-integrator/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, uget, python3Packages }: + +stdenv.mkDerivation rec { + name = "uget-integrator-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "ugetdm"; + repo = "uget-integrator"; + rev = "v${version}"; + sha256 = "0bfqwbpprxp5sy49p2hqcjdfj7zamnp2hhcnnyccffkn7pghx8pp"; + }; + + nativeBuildInputs = [ python3Packages.wrapPython ]; + + buildInputs = [ uget python3Packages.python ]; + + installPhase = '' + for f in conf/com.ugetdm.{chrome,firefox}.json; do + substituteInPlace $f --replace "/usr" "$out" + done + + install -D -t $out/bin bin/uget-integrator + install -D -t $out/etc/opt/chrome/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/chromium/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/etc/opera/native-messaging-hosts conf/com.ugetdm.chrome.json + install -D -t $out/lib/mozilla/native-messaging-hosts conf/com.ugetdm.firefox.json + + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Native messaging host to integrate uGet Download Manager with web browsers"; + homepage = https://github.com/ugetdm/uget-integrator; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 77df8cbf6f7d..ec6c9c196788 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { - version = "1.2.4"; + version = "1.2.8"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "0n035f2qslw1srxjlm0szrnvb3va3sspbpxqqhng08dp68vmn9wz"; + sha256 = "0iwaaicf3wa1xi20k2w18q01d0dlmf5w9akf227bcsqdalsdzqh8"; }; preConfigure = '' @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.gpl3; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; } |