diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 0254ba7fb865..7447c2bf2d65 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -86,6 +86,8 @@ - The packages `iw` and `wirelesstools` (`iwconfig`, `iwlist`, etc.) are no longer installed implicitly if wireless networking has been enabled. +- `services.uptime` has been removed because the package it relies on does not exist anymore in nixpkgs. + - `services.kubernetes.addons.dns.coredns` has been renamed to `services.kubernetes.addons.dns.corednsImage` and now expects a package instead of attrs. Now, by default, nixpkgs.coredns in conjunction with dockerTools.buildImage is used, instead of pulling the upstream container image from Docker Hub. If you want the old behavior, you can set: diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index e7fb4c7f463f..21d48d2497ee 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1069,7 +1069,6 @@ ./services/monitoring/unpoller.nix ./services/monitoring/ups.nix ./services/monitoring/uptime-kuma.nix - ./services/monitoring/uptime.nix ./services/monitoring/vlagent.nix ./services/monitoring/vmagent.nix ./services/monitoring/vmalert.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 68f89cf0c27b..2bc28896f600 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -328,6 +328,10 @@ in (mkRemovedOptionModule [ "services" "unifi-video" ] "The unifi-video package and the corresponding module have been removed as the software has been unsupported since 2021 and requires a MongoDB version that has reached end of life." ) + (mkRemovedOptionModule [ + "services" + "uptime" + ] "The package for services.uptime has been removed from nixpkgs.") (mkRemovedOptionModule [ "services" "venus" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" diff --git a/nixos/modules/services/monitoring/uptime.nix b/nixos/modules/services/monitoring/uptime.nix deleted file mode 100644 index 53e2d441bd49..000000000000 --- a/nixos/modules/services/monitoring/uptime.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - config, - options, - pkgs, - lib, - ... -}: -let - inherit (lib) - literalExpression - mkOption - mkEnableOption - mkIf - mkMerge - types - optional - ; - - cfg = config.services.uptime; - opt = options.services.uptime; - - configDir = pkgs.runCommand "config" { preferLocalBuild = true; } ( - if cfg.configFile != null then - '' - mkdir $out - ext=`echo ${cfg.configFile} | grep -o \\..*` - ln -sv ${cfg.configFile} $out/default$ext - ln -sv /var/lib/uptime/runtime.json $out/runtime.json - '' - else - '' - mkdir $out - cat ${pkgs.nodePackages.node-uptime}/lib/node_modules/node-uptime/config/default.yaml > $out/default.yaml - cat >> $out/default.yaml <