diff options
| author | misuzu <bakalolka@gmail.com> | 2020-02-27 12:47:33 +0200 |
|---|---|---|
| committer | misuzu <bakalolka@gmail.com> | 2021-09-28 10:47:48 +0300 |
| commit | cf9ac2b544aca2b5af5cf1650aafefc88605c95f (patch) | |
| tree | db225438a8dd60a831385a1d93cd0f5ea769ba0f | |
| parent | 31ffc50c571e6683e9ecc9dbcbd4a8e9914b4497 (diff) | |
| download | nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar.gz nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar.bz2 nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar.lz nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar.xz nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.tar.zst nixpkgs-cf9ac2b544aca2b5af5cf1650aafefc88605c95f.zip | |
iptables: switch from iptables-legacy to iptables-nftables-compat
This should ease the migration to nftables.
| -rw-r--r-- | pkgs/os-specific/linux/iptables/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nftables/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index fe0e82c4a8e..50730597d9e 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap -, nftablesCompat ? false +, nftablesCompat ? true }: with lib; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e0e69adb4b6..73adcd78605 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -4,7 +4,7 @@ , gmp, jansson, readline , withDebugSymbols ? false , withPython ? false , python3 -, withXtables ? false , iptables +, withXtables ? true , iptables }: with lib; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c53485f5dea..207aae294fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21396,9 +21396,9 @@ with pkgs; iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); # hiPrio for collisions with inetutils (ping and tftpd.8.gz) - iptables = iptables-legacy; - iptables-legacy = callPackage ../os-specific/linux/iptables { }; - iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; }; + iptables = callPackage ../os-specific/linux/iptables { }; + iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; }; + iptables-nftables-compat = iptables; iptstate = callPackage ../os-specific/linux/iptstate { } ; |