From 275f1ba49f3ea8444a5d844be814ee3064176435 Mon Sep 17 00:00:00 2001 From: Colin Date: Tue, 24 Oct 2023 02:25:29 +0000 Subject: [PATCH] trust-dns: 0.23.0 -> 0.24.0 --- hosts/by-name/servo/services/trust-dns.nix | 2 +- nixpatches/list.nix | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/hosts/by-name/servo/services/trust-dns.nix b/hosts/by-name/servo/services/trust-dns.nix index 0dfb021d..e7958ad0 100644 --- a/hosts/by-name/servo/services/trust-dns.nix +++ b/hosts/by-name/servo/services/trust-dns.nix @@ -151,7 +151,7 @@ in lib.mkMerge [ ''; serviceConfig = config.systemd.services.trust-dns.serviceConfig // { ExecStart = '' - ${pkgs.trust-dns}/bin/trust-dns \ + ${pkgs.trust-dns}/bin/${pkgs.trust-dns.meta.mainProgram} \ --port ${builtins.toString port} \ --zonedir ${zoneDirFor flavor}/ \ --config ${configFile} ${flagsStr} diff --git a/nixpatches/list.nix b/nixpatches/list.nix index c671350a..f0b75b5c 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.23.0 -> 0.24.0"; + prUrl = "https://github.com/NixOS/nixpkgs/pull/263054"; + saneCommit = "cb13904421c1870df1059bfe5988a24107983a5f"; + hash = "sha256-iZ8ox5GdY6s+fyyUFPboIalYadAnsjxk6jNOdkQcZjI="; + }) # (fetchpatch' { # title = "trust-dns: 0.23.0 -> 0.24.0"; # prUrl = "https://github.com/NixOS/nixpkgs/pull/262466";