iptables{,-legacy}: migrate to by-name (#512129)
This commit is contained in:
@@ -0,0 +1,11 @@
|
||||
{
|
||||
iptables,
|
||||
...
|
||||
}@args:
|
||||
|
||||
(iptables.override (
|
||||
{
|
||||
nftablesCompat = false;
|
||||
}
|
||||
// removeAttrs args [ "iptables" ]
|
||||
))
|
||||
@@ -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 = [
|
||||
@@ -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 { };
|
||||
|
||||
Reference in New Issue
Block a user