Merge branch 'nix-darwin:master' into master

Author: orzklv

modules/launchd/launchd.nix

@@ -121,7 +121,17 @@ in
         key. Please note: many people are confused by this key. Please read `execvp(3)` very carefully!
       '';
       # TODO: Remove this some time after 25.11.
-      apply = map (value: lib.warnIf (lib.hasInfix "&" value) "A value for `ProgramArguments` contains the literal string `&`. This is no longer necessary and will lead to double-escaping, as nix-darwin now automatically escapes special characters." value);
+      apply =
+        val:
+        if (builtins.isNull val) then
+          val
+        else
+          (map (
+            item:
+            lib.warnIf (lib.hasInfix "&" item)
+              "A value for `ProgramArguments` contains the literal string `&`. This is no longer necessary and will lead to double-escaping, as nix-darwin now automatically escapes special characters."
+            item
+          ) val);
     };
 
     EnableGlobbing = mkOption {

modules/nix/default.nix

@@ -835,7 +835,7 @@ in
 
     system.requiresPrimaryUser = mkIf (
       config.system.stateVersion < 2
-      && options.nix.nixPath.highestPrio == (mkDefault {}).priotity
+      && options.nix.nixPath.highestPrio == (mkDefault {}).priority
     ) [
       "nix.nixPath"
     ];

modules/services/github-runner/options.nix

@@ -262,8 +262,8 @@ in
         };
 
         nodeRuntimes = mkOption {
-          type = with types; nonEmptyListOf (enum [ "node20" ]);
-          default = [ "node20" ];
+          type = with types; nonEmptyListOf (enum [ "node20" "node24" ]);
+          default = [ "node20" "node24" ];
           description = ''
             List of Node.js runtimes the runner should support.
           '';

modules/services/github-runner/service.nix

@@ -76,7 +76,7 @@ in
 
   config.launchd.daemons = flip mapAttrs' config.services.github-runners (name: cfg:
     let
-      package = cfg.package.override (old: optionalAttrs (hasAttr "nodeRuntimes" old) { inherit (cfg) nodeRuntimes; });
+      package = cfg.package.override { inherit (cfg) nodeRuntimes; };
       stateDir = mkStateDir cfg;
       logDir = mkLogDir cfg;
       workDir = mkWorkDir cfg;

tests/services-github-runners.nix

@@ -4,9 +4,6 @@
     enable = true;
     url = "https://github.com/nixos/nixpkgs";
     tokenFile = "/secret/path/to/a/github/token";
-    # We need an overridable derivation but cannot use the actual github-runner package
-    # since it still relies on Node.js 16 which is marked as insecure.
-    package = pkgs.hello;
   };
 
   test = ''