From 9f70c19a41f47f30c444e330a75196eba780dfd3 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 20 Oct 2023 12:59:36 +0200 Subject: [PATCH 1/2] nftables: 1.0.8 -> 1.0.9 https://lwn.net/Articles/948274/ --- pkgs/os-specific/linux/nftables/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e84d6aa6ac5c..d4007158c818 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -11,12 +11,12 @@ }: stdenv.mkDerivation rec { - version = "1.0.8"; + version = "1.0.9"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-k3N0DeQagtvJiBjgpGoHP664qNBon6T6GnQ5nDK/PVA="; + hash = "sha256-o8MEzZugYSOe4EdPmvuTipu5nYm5YCRvZvDDoKheFM0="; }; nativeBuildInputs = [ From c81e533e6d13245177f9ad7487e36c33f3b8eb9b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Fri, 20 Oct 2023 13:02:51 +0200 Subject: [PATCH 2/2] nftables: fix passthru.tests follow-up to f1c0589e4c778cc5852a14c6776a7053177983c3 --- pkgs/os-specific/linux/nftables/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index d4007158c818..4482170d346b 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -44,7 +44,8 @@ stdenv.mkDerivation rec { ++ lib.optional withXtables "--with-xtables"; passthru.tests = { - inherit (nixosTests) firewall-nftables lxd-nftables; + inherit (nixosTests) firewall-nftables; + lxd-nftables = nixosTests.lxd.nftables; nat = { inherit (nixosTests.nat.nftables) firewall standalone; }; };