colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

trust-dns: 0.22.1 -> 0.23.0

Browse Source
This commit is contained in:
Colin 2023-09-13 02:53:06 +00:00
parent a359350d7e
commit f54d5a68ff
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hosts/by-name/servo/services/trust-dns.nix
View File

@ -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

8
nixpatches/list.nix
View File

@ -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' {