public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iptables-compat: rename to iptables-nftables-compat

Browse Source 
Same as debian, more clarity what the package is about.
This commit is contained in:
Jörg Thalheim 2019-09-22 09:00:41 +01:00
parent 32f6ce33ed
commit 88c5b20606
No known key found for this signature in database
GPG Key ID: B3F5D81B0C6967C4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/os-specific/linux/iptables/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison { stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison
, libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap
, modeCompat ? false , nftablesCompat ? false
}: }:
with stdenv.lib; with stdenv.lib;
@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
"--enable-libipq" "--enable-libipq"
"--enable-nfsynproxy" "--enable-nfsynproxy"
"--enable-shared" "--enable-shared"
] ++ optional (!modeCompat) "--disable-nftables"; ] ++ optional (!nftablesCompat) "--disable-nftables";
outputs = [ "out" "dev" ]; outputs = [ "out" "dev" ];
postInstall = optional modeCompat '' postInstall = optional nftablesCompat ''
rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save} rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save}
ln -sv xtables-nft-multi $out/bin/iptables ln -sv xtables-nft-multi $out/bin/iptables
ln -sv xtables-nft-multi $out/bin/iptables-restore ln -sv xtables-nft-multi $out/bin/iptables-restore

2
pkgs/top-level/all-packages.nix
View File

@ -15631,7 +15631,7 @@ in
iptables = iptables-legacy; iptables = iptables-legacy;
iptables-legacy = callPackage ../os-specific/linux/iptables { }; iptables-legacy = callPackage ../os-specific/linux/iptables { };
iptables-compat = callPackage ../os-specific/linux/iptables { modeCompat = true; }; iptables-nftables-compat = callPackage ../os-specific/linux/iptables { nftablesCompat = true; };
iptstate = callPackage ../os-specific/linux/iptstate { } ; iptstate = callPackage ../os-specific/linux/iptstate { } ;