diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
15 files changed, 44 insertions, 78 deletions
diff --git a/nixpkgs/pkgs/tools/networking/ddns-go/default.nix b/nixpkgs/pkgs/tools/networking/ddns-go/default.nix index 1785eae4580c..fb4adc99fa3c 100644 --- a/nixpkgs/pkgs/tools/networking/ddns-go/default.nix +++ b/nixpkgs/pkgs/tools/networking/ddns-go/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ddns-go"; - version = "5.6.3"; + version = "5.6.4"; src = fetchFromGitHub { owner = "jeessy2"; repo = pname; rev = "v${version}"; - hash = "sha256-yOi2dowde2hTZOWq1Trpf3tAypA6bD6SawP5geqK7Ms="; + hash = "sha256-wE4xzAH31yQ8xrA0dI7f961KNwK84gRSit+XNoW37pc="; }; vendorHash = "sha256-e4mmUneFZCsteSrxfSeeky/pFc0sgNs0eRVnZQuG1ZI="; diff --git a/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock b/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock index 07b8e2894bb5..81f9d4667a65 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock +++ b/nixpkgs/pkgs/tools/networking/findomain/Cargo.lock @@ -609,7 +609,7 @@ dependencies = [ [[package]] name = "findomain" -version = "9.0.1" +version = "9.0.3" dependencies = [ "addr", "anyhow", diff --git a/nixpkgs/pkgs/tools/networking/findomain/default.nix b/nixpkgs/pkgs/tools/networking/findomain/default.nix index 1f5d4c8b01af..636dcc709462 100644 --- a/nixpkgs/pkgs/tools/networking/findomain/default.nix +++ b/nixpkgs/pkgs/tools/networking/findomain/default.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "9.0.2"; + version = "9.0.3"; src = fetchFromGitHub { owner = "findomain"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-CFnjZHTga70+b7XUdxGC/ycqY2snkLvFKPApTRlN11s="; + hash = "sha256-M6i62JI4HjaM0C2rSK8P5O19JeugFP5xIy1E6vE8KP4="; }; cargoLock = { diff --git a/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 8675e3e69598..a1db32558aab 100644 --- a/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.19.0"; + version = "3.20.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-zDLL+3k6/Jgq/pflpmjuLcfPzvDl0LQLQklW+kOvtQg="; + sha256 = "sha256-kdeDV8IWbfeC6KDgJtOl1NX6jwvxiaIdGAYtrDuYFdI="; }; - vendorHash = "sha256-8qEGp95y8iBIJXCTh2Pa/JwiruZVVIjHLwaZqwFZMl8="; + vendorHash = "sha256-5eB3vFOo3LCsjMnWYFH0yq5+IunwKXp5C34x6NvpFZ8="; postConfigure = '' export CGO_ENABLED=0 diff --git a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix index 7919698f53d2..f79092164c7a 100644 --- a/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.59.1"; + version = "1.59.2"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-4bou7oFQOgyxjFqJdmiFT8xEMCsOap9v34W6SPrT4WQ="; + hash = "sha256-ZWVXoup+gpELOsdCg36swiJFeDdioR/cHkDV68OWsso="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index a99f26effc13..02ad218cbf17 100644 --- a/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "grpcurl"; - version = "1.8.8"; + version = "1.8.9"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcurl"; rev = "v${version}"; - sha256 = "sha256-/GPFUMN6NQAoKOYJ6j9j0GmyEcYtYdOB7B8v2gNpNm8="; + sha256 = "sha256-zN/vleCph919HXZZ9wsXoJBXRT6y7gjyuQxnjRMzq00="; }; subPackages = [ "cmd/grpcurl" ]; - vendorHash = "sha256-8mGlmWuWae/NQ1aR0KVj0XS7rqROCs0PBDUkMAKijYU="; + vendorHash = "sha256-g5G966CuaVILGAgWunHAPrrkLjSv8pBj9R4bcLzyI+A="; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; diff --git a/nixpkgs/pkgs/tools/networking/hurl/default.nix b/nixpkgs/pkgs/tools/networking/hurl/default.nix index d34d00f56b51..231a28f8935a 100644 --- a/nixpkgs/pkgs/tools/networking/hurl/default.nix +++ b/nixpkgs/pkgs/tools/networking/hurl/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "hurl"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "Orange-OpenSource"; repo = pname; rev = version; - hash = "sha256-ubzcCY3ccjt2VSZNx9+l3M/z4o7wWcE7USAlA9BnQY0="; + hash = "sha256-JsgAdLjDQQkLyLFoZCVG2jZ8vQDaGUPtPmHYAcwADQg"; }; - cargoHash = "sha256-C8WeYFaqF748QZkp/CppqJjF3QW1k7OWXycxSoxKPOI="; + cargoHash = "sha256-IE9c57rj8EANyj4KmbyagafJyMovzHOhp0PFCQBzqdA="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/networking/kapp/default.nix b/nixpkgs/pkgs/tools/networking/kapp/default.nix index a00f851c24d1..d1b0ad03c303 100644 --- a/nixpkgs/pkgs/tools/networking/kapp/default.nix +++ b/nixpkgs/pkgs/tools/networking/kapp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kapp"; - version = "0.59.0"; + version = "0.59.1"; src = fetchFromGitHub { owner = "carvel-dev"; repo = "kapp"; rev = "v${version}"; - sha256 = "sha256-I+BXKJvilrYvSi2xevZKFE49emghg19dCpW/bbIcZ8o="; + sha256 = "sha256-0fvcBJzJB3o9gQiFfm9+qGTWcoJY2X4AR2XR8RRjerg="; }; vendorHash = null; diff --git a/nixpkgs/pkgs/tools/networking/kea/default.nix b/nixpkgs/pkgs/tools/networking/kea/default.nix index 7c3cab0fe5a7..2e642b17f87c 100644 --- a/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -5,8 +5,11 @@ # build time , autoreconfHook , pkg-config +, python3Packages # runtime +, withMysql ? stdenv.buildPlatform.system == stdenv.hostPlatform.system +, withPostgres ? stdenv.buildPlatform.system == stdenv.hostPlatform.system , boost , libmysqlclient , log4cplus @@ -48,9 +51,10 @@ stdenv.mkDerivation rec { "--enable-shell" "--localstatedir=/var" "--with-openssl=${lib.getDev openssl}" - "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config" - "--with-pgsql=${postgresql}/bin/pg_config" - ]; + ] + ++ lib.optional withPostgres "--with-pgsql=${postgresql}/bin/pg_config" + ++ lib.optional withMysql "--with-mysql=${lib.getDev libmysqlclient}/bin/mysql_config"; + postConfigure = '' # Mangle embedded paths to dev-only inputs. sed -e "s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" -i config.report @@ -59,7 +63,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config - ] ++ (with python3.pkgs; [ + ] ++ (with python3Packages; [ sphinxHook sphinx-rtd-theme ]); diff --git a/nixpkgs/pkgs/tools/networking/openssh/common.nix b/nixpkgs/pkgs/tools/networking/openssh/common.nix index 7d01deb36020..bf645edec391 100644 --- a/nixpkgs/pkgs/tools/networking/openssh/common.nix +++ b/nixpkgs/pkgs/tools/networking/openssh/common.nix @@ -18,11 +18,13 @@ , zlib , openssl , libedit +, ldns , pkg-config , pam , libredirect , etcDir ? null , withKerberos ? true +, withLdns ? true , libkrb5 , libfido2 , hostname @@ -64,6 +66,7 @@ stdenv.mkDerivation { buildInputs = [ zlib openssl libedit ] ++ lib.optional withFIDO libfido2 ++ lib.optional withKerberos libkrb5 + ++ lib.optional withLdns ldns ++ lib.optional withPAM pam; preConfigure = '' @@ -87,6 +90,7 @@ stdenv.mkDerivation { ++ lib.optional withKerberos (assert libkrb5 != null; "--with-kerberos5=${libkrb5}") ++ lib.optional stdenv.isDarwin "--disable-libutil" ++ lib.optional (!linkOpenssl) "--without-openssl" + ++ lib.optional withLdns "--with-ldns" ++ extraConfigureFlags; ${if stdenv.hostPlatform.isStatic then "NIX_LDFLAGS" else null}= [ "-laudit" ] ++ lib.optionals withKerberos [ "-lkeyutils" ]; diff --git a/nixpkgs/pkgs/tools/networking/saldl/default.nix b/nixpkgs/pkgs/tools/networking/saldl/default.nix index d02acb3100a7..fb373fb5029e 100644 --- a/nixpkgs/pkgs/tools/networking/saldl/default.nix +++ b/nixpkgs/pkgs/tools/networking/saldl/default.nix @@ -10,6 +10,7 @@ , libxslt , curl , libevent +, fetchpatch }: stdenv.mkDerivation rec { @@ -23,6 +24,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-PAX2MUyBWWU8kGkaeoCJteidgszh7ipwDJbrLXzVsn0="; }; + patches = [ + (fetchpatch { + name = "update-waf-to-2-0-24.patch"; + url = "https://github.com/saldl/saldl/commit/360c29d6c8cee5f7e608af42237928be429c3407.patch"; + hash = "sha256-RBMnsUtd0BaZe/EXypDCK4gpUU0dgucWmOcJRn5/iTA="; + }) + ]; + nativeBuildInputs = [ pkg-config wafHook diff --git a/nixpkgs/pkgs/tools/networking/sing-box/default.nix b/nixpkgs/pkgs/tools/networking/sing-box/default.nix index 460f6f4e039e..d010e520be2c 100644 --- a/nixpkgs/pkgs/tools/networking/sing-box/default.nix +++ b/nixpkgs/pkgs/tools/networking/sing-box/default.nix @@ -11,23 +11,22 @@ buildGoModule rec { pname = "sing-box"; - version = "1.5.4"; + version = "1.6.0"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-XOp8kdF5UcmWrU43WfHk0EI8E+dPxgR2Ck5yC2ANcWI="; + hash = "sha256-buYI/WCVwjN5iSmyT1sM969oFuOPxaEjK5CwrLuX7/o="; }; - vendorHash = "sha256-ng+6fxmwjRIXuH6xDY9JFefMtlMJqaNlfCET9YRuK3k="; + vendorHash = "sha256-gEUYR7nfmaAcm9qJt8q0IFd/EECHbxuWYZIU+nVs100="; tags = [ "with_quic" "with_grpc" "with_dhcp" "with_wireguard" - "with_shadowsocksr" "with_ech" "with_utls" "with_reality_server" diff --git a/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/nixpkgs/pkgs/tools/networking/wavemon/default.nix index e7589862e511..8db0ed674b4f 100644 --- a/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wavemon"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "uoaerg"; repo = "wavemon"; rev = "v${version}"; - sha256 = "0s3yz15vzx90fxyb8bgryksn0cr2gpz9inbcx4qjrgs7zfbm4pgh"; + sha256 = "sha256-MvIFuPATI0Y7aIYZkb2Yr+iCco4gILHhDU5FWeMCk5Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch b/nixpkgs/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch deleted file mode 100644 index b4edc6a83871..000000000000 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/change-runtime-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN a/src/defaults/defaults_linux.go b/src/defaults/defaults_linux.go ---- a/src/defaults/defaults_linux.go 2019-06-17 10:23:09.495613784 -0700 -+++ b/src/defaults/defaults_linux.go 2019-07-01 10:17:11.295669440 -0700 -@@ -7,7 +7,7 @@ - func GetDefaults() platformDefaultParameters { - return platformDefaultParameters{ - // Admin -- DefaultAdminListen: "unix:///var/run/yggdrasil.sock", -+ DefaultAdminListen: "unix:///var/run/yggdrasil/yggdrasil.sock", - - // Configuration (used for yggdrasilctl) - DefaultConfigFile: "/etc/yggdrasil.conf", diff --git a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix deleted file mode 100644 index 5154ef60bd0a..000000000000 --- a/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: - -buildGoModule rec { - pname = "yggdrasil"; - version = "0.4.7"; - - src = fetchFromGitHub { - owner = "yggdrasil-network"; - repo = "yggdrasil-go"; - rev = "v${version}"; - sha256 = "sha256-01ciAutRIn4DmqlvDTXhRiuZHTtF8b6js7SUrLOjtAY="; - }; - - vendorHash = "sha256-hwDi59Yp92eMDqA8OD56nxsKSX2ngxs0lYdmEMLX+Oc="; - - # Change the default location of the management socket on Linux - # systems so that the yggdrasil system service unit does not have to - # be granted write permission to /run. - patches = [ ./change-runtime-dir.patch ]; - - subPackages = [ "cmd/genkeys" "cmd/yggdrasil" "cmd/yggdrasilctl" ]; - - ldflags = [ - "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" - "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" - "-s" "-w" - ]; - - passthru.tests.basic = nixosTests.yggdrasil; - - meta = with lib; { - description = - "An experiment in scalable routing as an encrypted IPv6 overlay network"; - homepage = "https://yggdrasil-network.github.io/"; - license = licenses.lgpl3; - maintainers = with maintainers; [ bbigras ehmry gazally lassulus ]; - }; -} |