mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
clatd: 1.6 -> 2.1.0
Removes iptables from clatd wrapper in favor of nftables used upstream. Also adds systemd-networkd integration.
This commit is contained in:
parent
ded63f105c
commit
ccae9bb5e8
1 changed files with 13 additions and 9 deletions
|
@ -7,19 +7,21 @@
|
|||
perlPackages,
|
||||
tayga,
|
||||
iproute2,
|
||||
iptables,
|
||||
nftables,
|
||||
systemd,
|
||||
nixosTests,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
assert (lib.assertMsg systemd.withNetworkd "systemd for clatd must be built with networkd support");
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
pname = "clatd";
|
||||
version = "1.6";
|
||||
version = "2.1.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "toreanderson";
|
||||
repo = "clatd";
|
||||
rev = "v${version}";
|
||||
hash = "sha256-ZUGWQTXXgATy539NQxkZSvQA7HIWkIPsw1NJrz0xKEg=";
|
||||
rev = "v${finalAttrs.version}";
|
||||
hash = "sha256-hNFuS6pdaA/FTIUeuwjGovlHcPh248Au1VXCzMuYwLU=";
|
||||
};
|
||||
|
||||
strictDeps = true;
|
||||
|
@ -33,6 +35,7 @@ stdenv.mkDerivation rec {
|
|||
perl
|
||||
NetIP
|
||||
NetDNS
|
||||
JSON
|
||||
];
|
||||
|
||||
makeFlags = [ "PREFIX=$(out)" ];
|
||||
|
@ -47,9 +50,10 @@ stdenv.mkDerivation rec {
|
|||
--set PERL5LIB $PERL5LIB \
|
||||
--prefix PATH : ${
|
||||
lib.makeBinPath [
|
||||
tayga
|
||||
iproute2
|
||||
iptables
|
||||
tayga # tayga
|
||||
iproute2 # ip
|
||||
nftables # nft
|
||||
systemd # networkctl
|
||||
]
|
||||
}
|
||||
'';
|
||||
|
@ -64,4 +68,4 @@ stdenv.mkDerivation rec {
|
|||
mainProgram = "clatd";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue