Merge master into staging-next

Author: nixpkgs-ci[bot]

nixos/doc/manual/redirects.json

@@ -1874,6 +1874,9 @@
   "test-opt-meta.platforms": [
     "index.html#test-opt-meta.platforms"
   ],
+  "test-opt-meta.hydraPlatforms": [
+    "index.html#test-opt-meta.hydraPlatforms"
+  ],
   "test-opt-meta.timeout": [
     "index.html#test-opt-meta.timeout"
   ],

nixos/lib/testing/default.nix

@@ -9,15 +9,13 @@ let
     };
   runTest =
     module:
-    # Infra issue: virtualization on darwin doesn't seem to work yet.
-    lib.addMetaAttrs { hydraPlatforms = lib.platforms.linux; }
-      (evalTest (
-        { config, ... }:
-        {
-          imports = [ module ];
-          result = config.test;
-        }
-      )).config.result;
+    (evalTest (
+      { config, ... }:
+      {
+        imports = [ module ];
+        result = config.test;
+      }
+    )).config.result;
 
   testModules = [
     ./call-test.nix

nixos/lib/testing/meta.nix

@@ -1,50 +1,61 @@
 { lib, ... }:
 let
-  inherit (lib) types mkOption;
+  inherit (lib) types mkOption literalMD;
 in
 {
   options = {
-    meta = lib.mkOption {
+    meta = mkOption {
       description = ''
         The [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes that will be set on the returned derivations.
 
         Not all [`meta`](https://nixos.org/manual/nixpkgs/stable/#chap-meta) attributes are supported, but more can be added as desired.
       '';
       apply = lib.filterAttrs (k: v: v != null);
-      type = types.submodule {
-        options = {
-          maintainers = lib.mkOption {
-            type = types.listOf types.raw;
-            default = [ ];
-            description = ''
-              The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
-            '';
+      type = types.submodule (
+        { config, ... }:
+        {
+          options = {
+            maintainers = mkOption {
+              type = types.listOf types.raw;
+              default = [ ];
+              description = ''
+                The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test.
+              '';
+            };
+            timeout = mkOption {
+              type = types.nullOr types.int;
+              default = 3600; # 1 hour
+              description = ''
+                The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
+              '';
+            };
+            broken = mkOption {
+              type = types.bool;
+              default = false;
+              description = ''
+                Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
+            platforms = mkOption {
+              type = types.listOf types.raw;
+              default = lib.platforms.linux ++ lib.platforms.darwin;
+              description = ''
+                Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
+            hydraPlatforms = mkOption {
+              type = types.listOf types.raw;
+              # Ideally this would default to `platforms` again:
+              # default = config.platforms;
+              default = lib.platforms.linux;
+              defaultText = literalMD "`lib.platforms.linux` only, as the `hydra.nixos.org` build farm does not currently support virtualisation on Darwin.";
+              description = ''
+                Sets the [`meta.hydraPlatforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-hydraPlatforms) attribute on the [{option}`test`](#test-opt-test) derivation.
+              '';
+            };
           };
-          timeout = lib.mkOption {
-            type = types.nullOr types.int;
-            default = 3600; # 1 hour
-            description = ''
-              The [{option}`test`](#test-opt-test)'s [`meta.timeout`](https://nixos.org/manual/nixpkgs/stable/#var-meta-timeout) in seconds.
-            '';
-          };
-          broken = lib.mkOption {
-            type = types.bool;
-            default = false;
-            description = ''
-              Sets the [`meta.broken`](https://nixos.org/manual/nixpkgs/stable/#var-meta-broken) attribute on the [{option}`test`](#test-opt-test) derivation.
-            '';
-          };
-          platforms = lib.mkOption {
-            type = types.listOf types.raw;
-            # darwin could be added, but it would add VM tests that don't work on Hydra.nixos.org (so far)
-            # see https://github.com/NixOS/nixpkgs/pull/303597#issuecomment-2128782362
-            default = lib.platforms.linux;
-            description = ''
-              Sets the [`meta.platforms`](https://nixos.org/manual/nixpkgs/stable/#var-meta-platforms) attribute on the [{option}`test`](#test-opt-test) derivation.
-            '';
-          };
-        };
-      };
+        }
+      );
       default = { };
     };
   };

nixos/modules/services/networking/headscale.nix

@@ -164,7 +164,7 @@ in
                 '';
               };
 
-              auto_update_enable = lib.mkOption {
+              auto_update_enabled = lib.mkOption {
                 type = lib.types.bool;
                 default = true;
                 description = ''
@@ -493,7 +493,11 @@ in
   imports = with lib; [
     (mkRenamedOptionModule
       [ "services" "headscale" "derp" "autoUpdate" ]
-      [ "services" "headscale" "settings" "derp" "auto_update_enable" ]
+      [ "services" "headscale" "settings" "derp" "auto_update_enabled" ]
+    )
+    (mkRenamedOptionModule
+      [ "services" "headscale" "derp" "auto_update_enable" ]
+      [ "services" "headscale" "settings" "derp" "auto_update_enabled" ]
     )
     (mkRenamedOptionModule
       [ "services" "headscale" "derp" "paths" ]

nixos/tests/all-tests.nix

@@ -1424,10 +1424,6 @@ in
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish60;
   };
-  varnish76 = runTest {
-    imports = [ ./varnish.nix ];
-    _module.args.package = pkgs.varnish76;
-  };
   varnish77 = runTest {
     imports = [ ./varnish.nix ];
     _module.args.package = pkgs.varnish77;

nixos/tests/web-apps/netbox-upgrade.nix

@@ -1,8 +1,18 @@
 import ../make-test-python.nix (
   { lib, pkgs, ... }:
   let
-    oldNetbox = pkgs.netbox_3_7;
-    newNetbox = pkgs.netbox_4_1;
+    oldNetbox = "netbox_4_1";
+    newNetbox = "netbox_4_2";
+
+    apiVersion =
+      version:
+      lib.pipe version [
+        (lib.splitString ".")
+        (lib.take 2)
+        (lib.concatStringsSep ".")
+      ];
+    oldApiVersion = apiVersion pkgs."${oldNetbox}".version;
+    newApiVersion = apiVersion pkgs."${newNetbox}".version;
   in
   {
     name = "netbox-upgrade";
@@ -15,12 +25,14 @@ import ../make-test-python.nix (
     };
 
     nodes.machine =
-      { config, ... }:
+      { config, pkgs, ... }:
       {
         virtualisation.memorySize = 2048;
         services.netbox = {
           enable = true;
-          package = oldNetbox;
+          # Pick the NetBox package from this config's "pkgs" argument,
+          # so that `nixpkgs.config.permittedInsecurePackages` works
+          package = pkgs."${oldNetbox}";
           secretKeyFile = pkgs.writeText "secret" ''
             abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
           '';
@@ -42,22 +54,13 @@ import ../make-test-python.nix (
 
         networking.firewall.allowedTCPPorts = [ 80 ];
 
-        specialisation.upgrade.configuration.services.netbox.package = lib.mkForce newNetbox;
+        nixpkgs.config.permittedInsecurePackages = [ pkgs."${oldNetbox}".name ];
+
+        specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs."${newNetbox}";
       };
 
     testScript =
       { nodes, ... }:
-      let
-        apiVersion =
-          version:
-          lib.pipe version [
-            (lib.splitString ".")
-            (lib.take 2)
-            (lib.concatStringsSep ".")
-          ];
-        oldApiVersion = apiVersion oldNetbox.version;
-        newApiVersion = apiVersion newNetbox.version;
-      in
       ''
         start_all()
         machine.wait_for_unit("netbox.target")

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix

@@ -17,19 +17,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-pMcUrsIVpb0lYhonEKB/5pZG+08OhL/Py7wmkmlXWgo=";
+        hash = "sha256-yJ4bAxIg3yfQJPWJcl6jUMwQ/ssHkstJWuEp3wr0dDA=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-dJilgYVLkx5JVHk3e3mZjW7qpWrviuB4OhtzV1DkmrI=";
+        hash = "sha256-EpWHwansBwBD0aYoW2ek7iWFbp+s7ZH6ug3ejoSRG5U=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-DyueVd+G67P48Oo0+HTC3Sg0/en/bRBV+F8mKuz66RY=";
+        hash = "sha256-345hK47tyMGMJDKiujwpECDHMbRpLi17x2lH2rMX9Lg=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-yk6bSeaEivx8kc3fqpSJBTMxUDsJGVwMoRxPPwaHgtc=";
+        hash = "sha256-u/vflQd285SuZ41ASd8nJgs+lN6892J3x6lPgWqVY+Y=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -39,7 +39,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csharp";
     publisher = "ms-dotnettools";
-    version = "2.72.34";
+    version = "2.76.27";
     inherit (extInfo) hash arch;
   };
 
@@ -134,8 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension {
     )
   '';
 
-  passthru.updateScript = ./update.sh;
-
   meta = {
     description = "Official C# support for Visual Studio Code";
     homepage = "https://github.com/dotnet/vscode-csharp";

pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/update.sh

@@ -0,0 +1,35 @@
+{ buildNpmPackage, anubis }:
+
+buildNpmPackage {
+  pname = "${anubis.pname}-xess";
+  inherit (anubis) version src;
+
+  npmDepsHash = "sha256-hTKTTBmfMGv6I+4YbWrOt6F+qD6ysVYi+DEC1konBFk=";
+
+  buildPhase = ''
+    runHook preBuild
+
+    npx postcss ./xess/xess.css -o xess.min.css
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 xess.min.css $out/xess.min.css
+
+    runHook postInstall
+  '';
+
+  meta = anubis.meta // {
+    description = "Xess files for Anubis";
+    longDescription = ''
+      This package is consumed by the main `anubis` package to render the final
+      styling for the bot check page.
+
+      **It is not supposed to be used as a standalone package**, and it exists to
+      ensure Anubis' styling is override-able by downstreams.
+    '';
+  };
+}