From 1e8ac19152fbe4454b4d2bfd885e136668de6d76 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 4 Oct 2024 06:51:03 +0100 Subject: [PATCH] libnftnl: 1.2.7 -> 1.2.8, nftables: 1.1.0 -> 1.1.1 Changes: https://lwn.net/Articles/992760/ --- pkgs/development/libraries/libnftnl/default.nix | 4 ++-- pkgs/os-specific/linux/nftables/default.nix | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index 1da5bf5a6de5..7613c940a46b 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }: stdenv.mkDerivation rec { - version = "1.2.7"; + version = "1.2.8"; pname = "libnftnl"; src = fetchurl { url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM="; + hash = "sha256-N/6l1rXJsI3nkg0pjePNyULnrmSxo+i4gLLTkK5nrZU="; }; configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index f0f62d1763fa..83ee5d3fbcbb 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -7,15 +7,16 @@ , withCli ? true, libedit , withXtables ? true, iptables , nixosTests +, gitUpdater }: stdenv.mkDerivation rec { - version = "1.1.0"; + version = "1.1.1"; pname = "nftables"; src = fetchurl { url = "https://netfilter.org/projects/nftables/files/${pname}-${version}.tar.xz"; - hash = "sha256-7zNzKUiGxbYH7nvoLFaiW8BOdfgC+OitzVWqyR6wqiQ="; + hash = "sha256-Y1iDDzpk8x45sK1CHX2tzSQLcjQ97UjY7xO4+vIEhlo="; }; nativeBuildInputs = [ @@ -42,6 +43,11 @@ stdenv.mkDerivation rec { nat = { inherit (nixosTests.nat.nftables) firewall standalone; }; }; + passthru.updateScript = gitUpdater { + url = "https://git.netfilter.org/nftables"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; homepage = "https://netfilter.org/projects/nftables/";