Merge master into staging-next

Author: nixpkgs-ci[bot]

maintainers/maintainer-list.nix

@@ -4992,7 +4992,7 @@
     githubId = 15233006;
   };
   connorbaker = {
-    email = "connor.baker@tweag.io";
+    email = "ConnorBaker01@gmail.com";
     matrix = "@connorbaker:matrix.org";
     github = "ConnorBaker";
     name = "Connor Baker";
@@ -18552,12 +18552,6 @@
     githubId = 16345849;
     name = "Parthiv Seetharaman";
   };
-  paddygord = {
-    email = "pgpatrickgordon@gmail.com";
-    github = "avagordon01";
-    githubId = 10776658;
-    name = "Patrick Gordon";
-  };
   paepcke = {
     email = "git@paepcke.de";
     github = "paepckehh";

nixos/lib/systemd-unit-options.nix

@@ -99,7 +99,7 @@ rec {
         Defines how unit configuration is provided for systemd:
 
         `asDropinIfExists` creates a unit file when no unit file is provided by the package
-        otherwise a drop-in file name `overrides.conf`.
+        otherwise it creates a drop-in file named `overrides.conf`.
 
         `asDropin` creates a drop-in file named `overrides.conf`.
         Mainly needed to define instances for systemd template units (e.g. `systemd-nspawn@mycontainer.service`).

nixos/modules/installer/tools/tools.nix

@@ -159,8 +159,8 @@ let
 
       # programs.firefox.enable = true;
 
-      # List packages installed in system profile. To search, run:
-      # \$ nix search wget
+      # List packages installed in system profile.
+      # You can use https://search.nixos.org/ to find more packages (and options).
       # environment.systemPackages = with pkgs; [
       #   vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
       #   wget

nixos/modules/services/hardware/udev.nix

@@ -55,10 +55,6 @@ let
         preferLocalBuild = true;
         allowSubstitutes = false;
         packages = lib.unique (map toString udevPackages);
-
-        nativeBuildInputs = [
-          pkgs.systemdMinimal
-        ];
       }
       ''
         mkdir -p $out
@@ -151,11 +147,6 @@ let
           exit 1
         fi
 
-        # Verify all the udev rules
-        echo "Verifying udev rules using udevadm verify..."
-        udevadm verify --resolve-names=never --no-style $out
-        echo "OK"
-
         # If auto-configuration is disabled, then remove
         # udev's 80-drivers.rules file, which contains rules for
         # automatically calling modprobe.

nixos/modules/services/monitoring/ups.nix

@@ -74,9 +74,9 @@ let
   };
 
   installSecrets =
-    source: target: secrets:
+    source: target: owner: secrets:
     pkgs.writeShellScript "installSecrets.sh" ''
-      install -m0600 -D ${source} "${target}"
+      install -m0600 -o${owner} -D ${source} "${target}"
       ${lib.concatLines (
         lib.forEach secrets (name: ''
           ${pkgs.replace-secret}/bin/replace-secret \
@@ -327,6 +327,23 @@ let
         description = "Whether to enable `upsmon`.";
       };
 
+      user = lib.mkOption {
+        type = lib.types.str;
+        default = "nutmon";
+        description = ''
+          User to run `upsmon` as. `upsmon.conf` will have its owner set to this
+          user. If not specified, a default user will be created.
+        '';
+      };
+      group = lib.mkOption {
+        type = lib.types.str;
+        default = "nutmon";
+        description = ''
+          Group for the default `nutmon` user. If the default user is created
+          and this is not specified, a default group will be created.
+        '';
+      };
+
       monitor = lib.mkOption {
         type = with lib.types; attrsOf (submodule monitorOptions);
         default = { };
@@ -344,7 +361,6 @@ let
             MONITOR = <generated from config.power.ups.upsmon.monitor>
             NOTIFYCMD = "''${pkgs.nut}/bin/upssched";
             POWERDOWNFLAG = "/run/killpower";
-            RUN_AS_USER = "root";
             SHUTDOWNCMD = "''${pkgs.systemd}/bin/shutdown now";
           }
         '';
@@ -382,7 +398,6 @@ let
         );
         NOTIFYCMD = lib.mkDefault "${pkgs.nut}/bin/upssched";
         POWERDOWNFLAG = lib.mkDefault "/run/killpower";
-        RUN_AS_USER = "root"; # TODO: replace 'root' by another username.
         SHUTDOWNCMD = lib.mkDefault "${pkgs.systemd}/bin/shutdown now";
       };
     };
@@ -581,7 +596,7 @@ in
     systemd.services.upsmon =
       let
         secrets = lib.mapAttrsToList (name: monitor: "upsmon_password_${name}") cfg.upsmon.monitor;
-        createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" secrets;
+        createUpsmonConf = installSecrets upsmonConf "/run/nut/upsmon.conf" cfg.upsmon.user secrets;
       in
       {
         enable = cfg.upsmon.enable;
@@ -591,7 +606,7 @@ in
         serviceConfig = {
           Type = "forking";
           ExecStartPre = "${createUpsmonConf}";
-          ExecStart = "${pkgs.nut}/sbin/upsmon";
+          ExecStart = "${pkgs.nut}/sbin/upsmon -u ${cfg.upsmon.user}";
           ExecReload = "${pkgs.nut}/sbin/upsmon -c reload";
           LoadCredential = lib.mapAttrsToList (
             name: monitor: "upsmon_password_${name}:${monitor.passwordFile}"
@@ -604,7 +619,7 @@ in
     systemd.services.upsd =
       let
         secrets = lib.mapAttrsToList (name: user: "upsdusers_password_${name}") cfg.users;
-        createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" secrets;
+        createUpsdUsers = installSecrets upsdUsers "/run/nut/upsd.users" "root" secrets;
       in
       {
         enable = cfg.upsd.enable;
@@ -696,18 +711,11 @@ in
 
     services.udev.packages = [ pkgs.nut ];
 
-    /*
-        users.users.nut =
-          { uid = 84;
-            home = "/var/lib/nut";
-            createHome = true;
-            group = "nut";
-            description = "UPnP A/V Media Server user";
-          };
-
-        users.groups."nut" =
-          { gid = 84; };
-    */
+    users.users.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon") {
+      isSystemUser = true;
+      group = cfg.upsmon.group;
+    };
+    users.groups.nutmon = lib.mkIf (cfg.upsmon.user == "nutmon" && cfg.upsmon.group == "nutmon") { };
 
   };
 }

nixos/modules/virtualisation/waagent.nix

@@ -228,11 +228,11 @@ let
         };
       };
 
-      AutoUpdate.Enable = lib.mkOption {
+      AutoUpdate.UpdateToLatestVersion = lib.mkOption {
         type = types.bool;
         default = false;
         description = ''
-          Whether or not to enable autoupdate for goal state processing.
+          Whether or not to enable auto-update of the Extension Handler.
         '';
       };
     };

nixos/tests/zram-generator.nix

@@ -38,9 +38,9 @@
     machine.wait_for_unit("systemd-zram-setup@zram0.service")
     machine.wait_for_unit("systemd-zram-setup@zram1.service")
     zram = machine.succeed("zramctl --noheadings --raw")
-    swap = machine.succeed("swapon --show --noheadings")
+    swap = machine.succeed("swapon --show --noheadings --raw")
     for i in range(2):
         assert f"/dev/zram{i} lz4 10M" in zram
-        assert f"/dev/zram{i} partition  10M" in swap
+        assert f"/dev/zram{i} partition 10M" in swap
   '';
 }

pkgs/applications/editors/vim/plugins/generated.nix

@@ -14545,6 +14545,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  timerly = buildVimPlugin {
+    pname = "timerly";
+    version = "2025-04-16";
+    src = fetchFromGitHub {
+      owner = "nvzone";
+      repo = "timerly";
+      rev = "17299a4d332c483ce09052fe8478b41b992f2594";
+      sha256 = "0nfyw98nb95df0dpnxlaipgar92b8z2z3rxfih2fc86m6gxv2mm2";
+    };
+    meta.homepage = "https://github.com/nvzone/timerly/";
+    meta.hydraPlatforms = [ ];
+  };
+
   timestamp-vim = buildVimPlugin {
     pname = "timestamp.vim";
     version = "2010-11-06";

pkgs/applications/editors/vim/plugins/overrides.nix

@@ -3353,6 +3353,10 @@ in
     ];
   };
 
+  timerly = super.timerly.overrideAttrs {
+    dependencies = [ self.nvzone-volt ];
+  };
+
   tmux-complete-vim = super.tmux-complete-vim.overrideAttrs {
     # Vim plugin with optional nvim-compe lua module
     nvimSkipModules = [ "compe_tmux" ];

pkgs/applications/editors/vim/plugins/vim-plugin-names

@@ -1116,6 +1116,7 @@ https://github.com/johmsalas/text-case.nvim/,HEAD,
 https://github.com/vhsconnect/themed-tabs.nvim/,HEAD,
 https://github.com/ron89/thesaurus_query.vim/,,
 https://github.com/itchyny/thumbnail.vim/,,
+https://github.com/nvzone/timerly/,HEAD,
 https://github.com/vim-scripts/timestamp.vim/,,
 https://github.com/levouh/tint.nvim/,HEAD,
 https://github.com/tinted-theming/tinted-vim/,HEAD,