pyrox.dev
clatd: 1.6 -> 2.1.0
Removes iptables from clatd wrapper in favor of nftables used upstream.
Also adds systemd-networkd integration.
+13
-9
pkgs/by-name/cl/clatd/package.nix
+13
-9
pkgs/by-name/cl/clatd/package.nix
···
7
7
perlPackages,
8
8
tayga,
9
9
iproute2,
10
-
iptables,
10
+
nftables,
11
+
systemd,
11
12
nixosTests,
12
13
}:
13
14
14
-
stdenv.mkDerivation rec {
15
+
assert (lib.assertMsg systemd.withNetworkd "systemd for clatd must be built with networkd support");
16
+
stdenv.mkDerivation (finalAttrs: {
15
17
pname = "clatd";
16
-
version = "1.6";
18
+
version = "2.1.0";
17
19
18
20
src = fetchFromGitHub {
19
21
owner = "toreanderson";
20
22
repo = "clatd";
21
-
rev = "v${version}";
22
-
hash = "sha256-ZUGWQTXXgATy539NQxkZSvQA7HIWkIPsw1NJrz0xKEg=";
23
+
rev = "v${finalAttrs.version}";
24
+
hash = "sha256-hNFuS6pdaA/FTIUeuwjGovlHcPh248Au1VXCzMuYwLU=";
23
25
};
24
26
25
27
strictDeps = true;
···
33
35
perl
34
36
NetIP
35
37
NetDNS
38
+
JSON
36
39
];
37
40
38
41
makeFlags = [ "PREFIX=$(out)" ];
···
47
50
--set PERL5LIB $PERL5LIB \
48
51
--prefix PATH : ${
49
52
lib.makeBinPath [
50
-
tayga
51
-
iproute2
52
-
iptables
53
+
tayga # tayga
54
+
iproute2 # ip
55
+
nftables # nft
56
+
systemd # networkctl
53
57
]
54
58
}
55
59
'';
···
64
68
mainProgram = "clatd";
65
69
platforms = platforms.linux;
66
70
};
67
-
}
71
+
})