From f54d5a68ff9e28b7789458b7f0fb2a56240071dc Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Wed, 13 Sep 2023 02:53:06 +0000
Subject: [PATCH] trust-dns: 0.22.1 -> 0.23.0

---
 hosts/by-name/servo/services/trust-dns.nix | 6 +++---
 nixpatches/list.nix                        | 8 +++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/hosts/by-name/servo/services/trust-dns.nix b/hosts/by-name/servo/services/trust-dns.nix
index 458771d4..4cfbb8e5 100644
--- a/hosts/by-name/servo/services/trust-dns.nix
+++ b/hosts/by-name/servo/services/trust-dns.nix
@@ -70,7 +70,7 @@
       zone-wan = "${zone-dir}/wan/uninsane.org.zone";
       zone-lan = "${zone-dir}/lan/uninsane.org.zone";
       zone-template = pkgs.writeText "uninsane.org.zone.in" config.sane.dns.zones."uninsane.org".rendered;
-    in pkgs.writeShellScriptBin "named" ''
+    in pkgs.writeShellScriptBin "trust-dns" ''
       # compute wan/lan values
       mkdir -p ${zone-dir}/{ovpn,wan,lan}
       wan=$(cat '${config.sane.services.dyn-dns.ipPath}')
@@ -87,9 +87,9 @@
         > ${zone-lan}
 
       # launch the different interfaces, separately
-      ${pkgs.trust-dns}/bin/named --port 53 --zonedir ${zone-dir}/wan/ $@ &
+      ${pkgs.trust-dns}/bin/trust-dns --port 53 --zonedir ${zone-dir}/wan/ $@ &
       WANPID=$!
-      ${pkgs.trust-dns}/bin/named --port 1053 --zonedir ${zone-dir}/lan/ $@ &
+      ${pkgs.trust-dns}/bin/trust-dns --port 1053 --zonedir ${zone-dir}/lan/ $@ &
       LANPID=$!
 
       # wait until any of the processes exits, then kill them all and exit error
diff --git a/nixpatches/list.nix b/nixpatches/list.nix
index f6292531..ce5ca358 100644
--- a/nixpatches/list.nix
+++ b/nixpatches/list.nix
@@ -19,6 +19,12 @@ let
       // (if title != null then { name = title; } else {})
     );
 in [
+  (fetchpatch' {
+    title = "trust-dns: 0.22.1 -> 0.23.0";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/254827";
+    hash = "sha256-0EPLiv+Ha943C5/l24pyY+VEUOEJ6UG9rr+EHTzFR0Q=";
+  })
+
   # (fetchpatch' {
   #   # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`.
   #   # the latter is an alias, which breaks nix-index
@@ -272,7 +278,7 @@ in [
     title = "gthumb: make the webservices feature be optional";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";
     saneCommit = "e83130f2770c314b2a482e1792b010da66cdd5de";
-    hash = "sha256-aQjjm4uP3RaAkKykTNFmnrf2fyY2FcwKerRprlO2cnQ=";
+    hash = "sha256-GlYWpOVZvr0oFAs4RdSUf7LJD3FmGsCaTm32GPhbBfc=";
   })
 
   (fetchpatch' {