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/os-specific/linux/iptables/default.nix b/pkgs/by-name/ip/iptables/package.nix similarity index 96% rename from pkgs/os-specific/linux/iptables/default.nix rename to pkgs/by-name/ip/iptables/package.nix index 701f906db213..edac9389c652 100644 --- a/pkgs/os-specific/linux/iptables/default.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 = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9d5402e0aee..868da99eb942 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8444,8 +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; jool-cli = callPackage ../os-specific/linux/jool/cli.nix { };