From e126b73d5230dd241a0a6e371dfe7b3118eea25a Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 21 Apr 2026 10:47:07 -0500 Subject: [PATCH 1/3] iptables: migrate to by-name --- .../iptables/default.nix => by-name/ip/iptables/package.nix} | 0 pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 deletion(-) rename pkgs/{os-specific/linux/iptables/default.nix => by-name/ip/iptables/package.nix} (100%) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/by-name/ip/iptables/package.nix similarity index 100% rename from pkgs/os-specific/linux/iptables/default.nix rename to pkgs/by-name/ip/iptables/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9d5402e0aee..e407596263d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8444,7 +8444,6 @@ with pkgs; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping) - iptables = callPackage ../os-specific/linux/iptables { }; iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; iptables-nftables-compat = iptables; From 5db630dd9dfd8e9cdca7ca328c070b76278130b8 Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 21 Apr 2026 10:52:30 -0500 Subject: [PATCH 2/3] iptables-legacy: migrate to by-name --- pkgs/by-name/ip/iptables-legacy/package.nix | 11 +++++++++++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/by-name/ip/iptables-legacy/package.nix diff --git a/pkgs/by-name/ip/iptables-legacy/package.nix b/pkgs/by-name/ip/iptables-legacy/package.nix new file mode 100644 index 000000000000..da3f0ab09f4a --- /dev/null +++ b/pkgs/by-name/ip/iptables-legacy/package.nix @@ -0,0 +1,11 @@ +{ + iptables, + ... +}@args: + +(iptables.override ( + { + nftablesCompat = false; + } + // removeAttrs args [ "iptables" ] +)) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e407596263d9..868da99eb942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8444,7 +8444,6 @@ with pkgs; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping) - iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; iptables-nftables-compat = iptables; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { }; From b2aa326b7355b847704783603083438c2996299b Mon Sep 17 00:00:00 2001 From: Guy Chronister Date: Tue, 21 Apr 2026 10:55:51 -0500 Subject: [PATCH 3/3] iptables: modernize derivation --- pkgs/by-name/ip/iptables/package.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ip/iptables/package.nix b/pkgs/by-name/ip/iptables/package.nix index 701f906db213..edac9389c652 100644 --- a/pkgs/by-name/ip/iptables/package.nix +++ b/pkgs/by-name/ip/iptables/package.nix @@ -29,19 +29,15 @@ iputils, }: -let - version = "1.8.13"; - pname = "iptables"; -in - stdenv.mkDerivation (finalAttrs: { - inherit pname version; + pname = "iptables"; + version = "1.8.13"; __structuredAttrs = true; src = fetchurl { - url = "https://www.netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz"; - sha256 = "GvzTPano+ROs5qISZ4gWLiB+JvXV4pxlc8Dlgf/Fi5k="; + url = "https://www.netfilter.org/projects/iptables/files/iptables-${finalAttrs.version}.tar.xz"; + hash = "sha256-GvzTPano+ROs5qISZ4gWLiB+JvXV4pxlc8Dlgf/Fi5k="; }; outputs = [