diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-02-13 18:01:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-13 18:01:51 +0000 |
| commit | 14a88d0edd813730fe32a9f3b91d6a67614fb624 (patch) | |
| tree | 4ab05a36b69221c29809fe4ab3329fe6afde8108 /pkgs/tools/networking | |
| parent | 6e3371ff454eda3e119f11c25ab1614d78bf8068 (diff) | |
| parent | 71791cd63d21ee57a6e4702d10b90166b7bf7b38 (diff) | |
| download | nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar.gz nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar.bz2 nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar.lz nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar.xz nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.tar.zst nixlib-14a88d0edd813730fe32a9f3b91d6a67614fb624.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/bgpq4/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/grpc_cli/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/keepalived/default.nix | 24 |
3 files changed, 22 insertions, 10 deletions
diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix index f26b22e7967c..f15b79a761f0 100644 --- a/pkgs/tools/networking/bgpq4/default.nix +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bgpq4"; - version = "1.11"; + version = "1.12"; src = fetchFromGitHub { owner = "bgp"; repo = pname; rev = version; - sha256 = "sha256-Mz26YWrVXiTOWywouehpTQ7PaakaXUsIHH+47m8vXDo="; + sha256 = "sha256-Irv91M5g21id0QfsnpDA7n5IhP8Qe9QHMh/KizD74qw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 844d315f5eb5..161fad0af7f3 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.61.0"; + version = "1.61.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-NLxcGFQ1F5RLoSFC0XYMjvGXkSWc/vLzgtk5qsOndEo="; + hash = "sha256-vrLkiNnsW6IpZNGhs6iZgEhdlV9Qpg8PLMDG2BKY2wo="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; diff --git a/pkgs/tools/networking/keepalived/default.nix b/pkgs/tools/networking/keepalived/default.nix index 02424d92de57..80059a664549 100644 --- a/pkgs/tools/networking/keepalived/default.nix +++ b/pkgs/tools/networking/keepalived/default.nix @@ -1,7 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, nixosTests -, file, libmnl, libnftnl, libnl -, net-snmp, openssl, pkg-config -, autoreconfHook }: +{ lib +, stdenv +, fetchFromGitHub +, nixosTests +, file +, libmnl +, libnftnl +, libnl +, net-snmp +, openssl +, pkg-config +, autoreconfHook +, withNetSnmp ? stdenv.buildPlatform.canExecute stdenv.hostPlatform +}: stdenv.mkDerivation rec { pname = "keepalived"; @@ -19,8 +29,9 @@ stdenv.mkDerivation rec { libmnl libnftnl libnl - net-snmp openssl + ] ++ lib.optionals withNetSnmp [ + net-snmp ]; enableParallelBuilding = true; @@ -31,8 +42,9 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-sha1" + ] ++ lib.optionals withNetSnmp [ "--enable-snmp" - ]; + ]; meta = with lib; { homepage = "https://keepalived.org"; |