movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-18 07:29:23 +03:00
Code Issues Projects Releases Packages Wiki Activity

iptables: switch from iptables-legacy to iptables-nftables-compat

Browse source 
This should ease the migration to nftables.
This commit is contained in:
misuzu 2020-02-27 12:47:33 +02:00
parent 31ffc50c57
commit cf9ac2b544
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/os-specific/linux/iptables/default.nix
View file

@ -1,6 +1,6 @@
{ lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison { lib, stdenv, fetchurl, pkg-config, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, nftablesCompat ? false , nftablesCompat ? true
}: }:
with lib; with lib;

2
pkgs/os-specific/linux/nftables/default.nix
View file

@ -4,7 +4,7 @@
, gmp, jansson, readline , gmp, jansson, readline
, withDebugSymbols ? false , withDebugSymbols ? false
, withPython ? false , python3 , withPython ? false , python3
, withXtables ? false , iptables , withXtables ? true , iptables
}: }:
with lib; with lib;

6
pkgs/top-level/all-packages.nix
View file

@ -21396,9 +21396,9 @@ with pkgs;
iputils = hiPrio (callPackage ../os-specific/linux/iputils { }); iputils = hiPrio (callPackage ../os-specific/linux/iputils { });
# hiPrio for collisions with inetutils (ping and tftpd.8.gz) # hiPrio for collisions with inetutils (ping and tftpd.8.gz)
iptables = iptables-legacy; iptables = callPackage ../os-specific/linux/iptables { };
iptables-legacy = callPackage ../os-specific/linux/iptables { }; iptables-legacy = callPackage ../os-specific/linux/iptables { nftablesCompat = false; };
iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; }; iptables-nftables-compat = iptables;
iptstate = callPackage ../os-specific/linux/iptstate { } ; iptstate = callPackage ../os-specific/linux/iptstate { } ;