trust-dns: 0.22.1 -> 0.23.0
This commit is contained in:
parent
a359350d7e
commit
f54d5a68ff
|
@ -70,7 +70,7 @@
|
||||||
zone-wan = "${zone-dir}/wan/uninsane.org.zone";
|
zone-wan = "${zone-dir}/wan/uninsane.org.zone";
|
||||||
zone-lan = "${zone-dir}/lan/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;
|
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
|
# compute wan/lan values
|
||||||
mkdir -p ${zone-dir}/{ovpn,wan,lan}
|
mkdir -p ${zone-dir}/{ovpn,wan,lan}
|
||||||
wan=$(cat '${config.sane.services.dyn-dns.ipPath}')
|
wan=$(cat '${config.sane.services.dyn-dns.ipPath}')
|
||||||
|
@ -87,9 +87,9 @@
|
||||||
> ${zone-lan}
|
> ${zone-lan}
|
||||||
|
|
||||||
# launch the different interfaces, separately
|
# 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=$!
|
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=$!
|
LANPID=$!
|
||||||
|
|
||||||
# wait until any of the processes exits, then kill them all and exit error
|
# wait until any of the processes exits, then kill them all and exit error
|
||||||
|
|
|
@ -19,6 +19,12 @@ let
|
||||||
// (if title != null then { name = title; } else {})
|
// (if title != null then { name = title; } else {})
|
||||||
);
|
);
|
||||||
in [
|
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' {
|
# (fetchpatch' {
|
||||||
# # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`.
|
# # disabled, at least until the PR is updated to use `pkg-config` instead of `pkgconfig`.
|
||||||
# # the latter is an alias, which breaks nix-index
|
# # the latter is an alias, which breaks nix-index
|
||||||
|
@ -272,7 +278,7 @@ in [
|
||||||
title = "gthumb: make the webservices feature be optional";
|
title = "gthumb: make the webservices feature be optional";
|
||||||
prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";
|
prUrl = "https://github.com/NixOS/nixpkgs/pull/240602";
|
||||||
saneCommit = "e83130f2770c314b2a482e1792b010da66cdd5de";
|
saneCommit = "e83130f2770c314b2a482e1792b010da66cdd5de";
|
||||||
hash = "sha256-aQjjm4uP3RaAkKykTNFmnrf2fyY2FcwKerRprlO2cnQ=";
|
hash = "sha256-GlYWpOVZvr0oFAs4RdSUf7LJD3FmGsCaTm32GPhbBfc=";
|
||||||
})
|
})
|
||||||
|
|
||||||
(fetchpatch' {
|
(fetchpatch' {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user