From ccae9bb5e813d7c7e197c8b363315b4def2bf32b Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Mon, 17 Mar 2025 13:51:17 -0700
Subject: [PATCH] clatd: 1.6 -> 2.1.0

Removes iptables from clatd wrapper in favor of nftables used upstream.
Also adds systemd-networkd integration.
---
 pkgs/by-name/cl/clatd/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cl/clatd/package.nix b/pkgs/by-name/cl/clatd/package.nix
index fc5e9a792cee..4e2d2742096b 100644
--- a/pkgs/by-name/cl/clatd/package.nix
+++ b/pkgs/by-name/cl/clatd/package.nix
@@ -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;
   };
-}
+})