Merge master into staging-next

Author: github-actions[bot]

maintainers/maintainer-list.nix

@@ -960,6 +960,12 @@
     githubId = 49609151;
     name = "Popa Ioan Alexandru";
   };
+  alexandru0-dev = {
+    email = "[email protected]";
+    github = "alexandru0-dev";
+    githubId = 45104896;
+    name = "Alexandru Nechita";
+  };
   alexarice = {
     email = "[email protected]";
     github = "alexarice";
@@ -7669,6 +7675,12 @@
     githubId = 111183546;
     keys = [ { fingerprint = "58CE D4BE 6B10 149E DA80  A990 2F48 6356 A4CB 30F3"; } ];
   };
+  genga898 = {
+    email = "[email protected]";
+    github = "genga898";
+    githubId = 84174227;
+    name = "Emmanuel Genga";
+  };
   genofire = {
     name = "genofire";
     email = "[email protected]";

nixos/doc/manual/release-notes/rl-2411.section.md

@@ -207,6 +207,10 @@
 
 - `deno` has been updated to v2 which has breaking changes. Upstream will be abandoning v1 soon but for now you can use `deno_1` if you are yet to migrate (will be removed prior to cutting a final 24.11 release).
 
+- `gogs` has been removed. Upstream development has stalled and it has several
+  [critical vulnerabilities](https://github.com/gogs/gogs/issues/7777) that weren't addressed
+  within a year. Consider migrating to `forgejo` or `gitea`.
+
 - `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.
 
 - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
@@ -695,6 +699,9 @@
 
 - ZFS now imports its pools in `postResumeCommands` rather than `postDeviceCommands`. If you had `postDeviceCommands` scripts that depended on ZFS pools being imported, those now need to be in `postResumeCommands`.
 
+- `services.automatic-timezoned.enable = true` will now set `time.timeZone = null`.
+  This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.
+
 - `services.localtimed.enable = true` will now set `time.timeZone = null`.
   This is to avoid silently shadowing a user's explicitly defined timezone without recognition on the user's part.
 

nixos/modules/misc/ids.nix

@@ -296,7 +296,7 @@ in
       sickbeard = 265;
       headphones = 266;
       # couchpotato = 267; # unused, removed 2022-01-01
-      gogs = 268;
+      # gogs = 268; # unused, removed in 2024-10-12
       #pdns-recursor = 269; # dynamically allocated as of 2020-20-18
       #kresd = 270; # switched to "knot-resolver" with dynamic ID
       rpc = 271;
@@ -607,7 +607,7 @@ in
       sickbeard = 265;
       headphones = 266;
       # couchpotato = 267; # unused, removed 2022-01-01
-      gogs = 268;
+      # gogs = 268; # unused, removed in 2024-10-12
       #kresd = 270; # switched to "knot-resolver" with dynamic ID
       #rpc = 271; # unused
       #geoip = 272; # unused

nixos/modules/module-list.nix

@@ -759,7 +759,6 @@
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
   ./services/misc/gitweb.nix
-  ./services/misc/gogs.nix
   ./services/misc/gollum.nix
   ./services/misc/gotenberg.nix
   ./services/misc/gpsd.nix

nixos/modules/services/misc/gogs.nix

@@ -16,13 +16,22 @@ in
           timezone up-to-date based on the current location. It uses geoclue2 to
           determine the current location and systemd-timedated to actually set
           the timezone.
+
+          To avoid silent overriding by the service, if you have explicitly set a
+          timezone, either remove it or ensure that it is set with a lower priority
+          than the default value using `lib.mkDefault` or `lib.mkOverride`. This is
+          to make the choice deliberate. An error will be presented otherwise.
         '';
       };
       package = mkPackageOption pkgs "automatic-timezoned" { };
     };
   };
 
   config = mkIf cfg.enable {
+    # This will give users an error if they have set an explicit time
+    # zone, rather than having the service silently override it.
+    time.timeZone = null;
+
     security.polkit.extraConfig = ''
       polkit.addRule(function(action, subject) {
         if (action.id == "org.freedesktop.timedate1.set-timezone"

nixos/modules/services/system/automatic-timezoned.nix

@@ -52,7 +52,7 @@ in
 
       ollamaUrl = lib.mkOption {
         type = lib.types.str;
-        default = "127.0.0.1:11434";
+        default = "http://127.0.0.1:11434";
         example = "https://ollama.example.org";
         description = ''
           The address (including host and port) under which we can access the Ollama backend server.
@@ -79,6 +79,7 @@ in
         serviceConfig = {
           ExecStart = "${lib.getExe nextjs-ollama-llm-ui}";
           DynamicUser = true;
+          CacheDirectory = "nextjs-ollama-llm-ui";
         };
       };
     };