summary refs log tree commit diff
path: root/nixos/modules/misc
diff options
context:
space:
mode:
authorVladimír Čunát <v@cunat.cz>2020-02-05 16:57:02 +0100
committerVladimír Čunát <v@cunat.cz>2020-02-05 16:57:02 +0100
commitbaeed035ea7ce2be8f33823d1cde7779dccedf1b (patch)
treed17fc9b5033c60e4215351ebc979bb6152a85330 /nixos/modules/misc
parentf8a0576f6ced8fd19c279c4f0d6ba12aab394bc7 (diff)
parente3edb004c6d62b191d70506f3f99bbf845ce1b52 (diff)
downloadnixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar.gz
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar.bz2
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar.lz
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar.xz
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.tar.zst
nixpkgs-baeed035ea7ce2be8f33823d1cde7779dccedf1b.zip
Merge #78628: knot-resolver: 4.3.0 -> 5.0.1
The service needed lots of changes. A few smaller changes
are added into the PR, e.g. replacement for PR #72014.
See the commit messages for details.
Diffstat (limited to 'nixos/modules/misc')
-rw-r--r--nixos/modules/misc/ids.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index bedd87a368e..979cdc5d4ad 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -299,7 +299,7 @@ in
       couchpotato = 267;
       gogs = 268;
       pdns-recursor = 269;
-      kresd = 270;
+      #kresd = 270; # switched to "knot-resolver" with dynamic ID
       rpc = 271;
       geoip = 272;
       fcron = 273;
@@ -600,7 +600,7 @@ in
       headphones = 266;
       couchpotato = 267;
       gogs = 268;
-      kresd = 270;
+      #kresd = 270; # switched to "knot-resolver" with dynamic ID
       #rpc = 271; # unused
       #geoip = 272; # unused
       fcron = 273;