From 88c5b206066d48c2038d230f219d69716f119162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 22 Sep 2019 09:00:41 +0100 Subject: [PATCH] iptables-compat: rename to iptables-nftables-compat Same as debian, more clarity what the package is about. --- pkgs/os-specific/linux/iptables/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 6b25342ed4c..882c24057bb 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, pruneLibtoolFiles, flex, bison , libmnl, libnetfilter_conntrack, libnfnetlink, libnftnl, libpcap -, modeCompat ? false +, nftablesCompat ? false }: with stdenv.lib; @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { "--enable-libipq" "--enable-nfsynproxy" "--enable-shared" - ] ++ optional (!modeCompat) "--disable-nftables"; + ] ++ optional (!nftablesCompat) "--disable-nftables"; outputs = [ "out" "dev" ]; - postInstall = optional modeCompat '' + postInstall = optional nftablesCompat '' 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-restore diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f946f432ae4..51ae18a9c9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15631,7 +15631,7 @@ in iptables = iptables-legacy; 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 { } ;