diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:27:16 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:41:25 +0100 |
| commit | 419bc0a4cdc0f577062f6c439809f4bf6e3b0c63 (patch) | |
| tree | 0f39c63fcddea75c562825d53a3f36bbba8b7930 /nixos/modules/misc/ids.nix | |
| parent | 873e6a4e65451be32e8dcd6151e1f26262ef35f2 (diff) | |
| download | nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.gz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.bz2 nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.lz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.xz nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.tar.zst nixpkgs-419bc0a4cdc0f577062f6c439809f4bf6e3b0c63.zip | |
Revert "Revert "Merge master into staging-next""
In 87a19e9048773d5a363679617406ad148d36c3b8 I merged staging-next into master using the GitHub gui as intended. In ac241fb7a570d6cf81d229ad22a8889602639160 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master. Thinking this may cause trouble, I reverted it in 0be87c79797a5fa384fbc356c74ed54f9f7829ea. This was however wrong, as it "removed" master. This reverts commit 0be87c79797a5fa384fbc356c74ed54f9f7829ea.
Diffstat (limited to 'nixos/modules/misc/ids.nix')
| -rw-r--r-- | nixos/modules/misc/ids.nix | 4 |
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; |