Merge master into staging-next

nixos/lib/test-driver/src/test_driver/__init__.py

@@ -89,11 +89,6 @@ def main() -> None:
         type=Path,
         required=True,
     )
-    arg_parser.add_argument(
-        "--test-script",
-        help="path to a test script to run, taking precedence over the one defined in the config file",
-        type=Path,
-    )
     arg_parser.add_argument(
         "--keep-vm-state",
         help=argparse.SUPPRESS,
@@ -168,12 +163,8 @@ def main() -> None:
     if args.debug_hook_attach is not None:
         debugger = Debug(logger, args.debug_hook_attach)
 
-    config = load_driver_configuration(args.config)
-    if args.test_script is not None:
-        config.test_script = args.test_script
-
     with Driver(
-        config=config,
+        config=load_driver_configuration(args.config),
         out_dir=output_directory,
         logger=logger,
         keep_machine_state=args.keep_machine_state,

nixos/modules/security/pam.nix

@@ -1422,6 +1422,7 @@ let
                 modulePath = config.security.pam.pam_unixModulePath;
                 settings = {
                   nullok = true;
+                  yescrypt = lib.mkIf config.security.pam.enableLegacySettings true;
                 };
               }
               {

nixos/modules/services/display-managers/gdm.nix

@@ -577,6 +577,7 @@ in
               control = "requisite";
               modulePath = config.security.pam.pam_unixModulePath;
               settings.nullok = true;
+              settings.yescrypt = true;
             }
           ];
 

nixos/modules/services/x11/display-managers/lightdm.nix

@@ -456,6 +456,7 @@ in
             control = "requisite";
             modulePath = config.security.pam.pam_unixModulePath;
             settings.nullok = true;
+            settings.yescrypt = true;
           }
         ];
 

nixos/tests/all-tests.nix

@@ -153,7 +153,6 @@ in
     console-log = runTest ./nixos-test-driver/console-log.nix;
     containers = runTest ./nixos-test-driver/containers.nix;
     nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix;
-    multi-arch-test = runTest ./nixos-test-driver/multi-arch-test.nix;
     skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix;
     console-timeout = runTest ./nixos-test-driver/console-timeout.nix;
     options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; };

nixos/tests/login-nosuid.nix

@@ -57,7 +57,6 @@
     with subtest("create user"):
         machine.succeed("useradd -m alice")
         machine.succeed("(echo foobar; echo foobar) | passwd alice")
-        machine.succeed("grep -F 'alice:$y$' /etc/shadow")
 
     with subtest("Check whether switching VTs works"):
         machine.fail("pgrep -f 'agetty.*tty2'")

nixos/tests/login.nix

@@ -28,7 +28,6 @@
     with subtest("create user"):
         machine.succeed("useradd -m alice")
         machine.succeed("(echo foobar; echo foobar) | passwd alice")
-        machine.succeed("grep -F 'alice:$y$' /etc/shadow")
 
     with subtest("Check whether switching VTs works"):
         machine.fail("pgrep -f 'agetty.*tty2'")

nixos/tests/nixos-test-driver/multi-arch-test.nix

@@ -1,55 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  name = "multi-arch-test";
-  meta.maintainers = with pkgs.lib.maintainers; [ tfc ];
-
-  node.pkgsReadOnly = false;
-
-  nodes = {
-    # Setting build = host platform because such standard VM setups
-    # are well-cached by the multi-arch build infrastructure of the
-    # project.
-    vmIntel = {
-      nixpkgs.buildPlatform = "x86_64-linux";
-      nixpkgs.hostPlatform = "x86_64-linux";
-    };
-    vmArm = {
-      nixpkgs.buildPlatform = "aarch64-linux";
-      nixpkgs.hostPlatform = "aarch64-linux";
-    };
-  };
-
-  defaults = {
-    # not needed for this test and shrinks the closure
-    # because we dont' need qemu for all architectures
-    virtualisation.qemu.guestAgent.enable = false;
-
-    # the test is already very slow but we don't need DHCP anyway
-    networking.dhcpcd.enable = false;
-
-    # fix the network-online target, otherwise it doesn't work
-    # properly as a synchronization mechanism.
-    systemd.network.wait-online.enable = true;
-    systemd.network.wait-online.anyInterface = true;
-  };
-
-  # slow due to SW emulation but shouldn't be slower than that
-  globalTimeout = 5 * 60;
-
-  testScript = { nodes, ... }: /* python */ ''
-    start_all()
-
-    vmIntel.systemctl("start network-online.target")
-    vmArm.systemctl("start network-online.target")
-    vmIntel.wait_for_unit("network-online.target")
-    vmArm.wait_for_unit("network-online.target")
-
-    vmIntel.succeed("ping -c 1 vmArm")
-    vmArm.succeed("ping -c 1 vmIntel")
-
-    archIntel = vmIntel.succeed("uname -m")
-    t.assertIn("${nodes.vmIntel.nixpkgs.hostPlatform.qemuArch}", archIntel, "machine1 is an intel VM")
-    archArm = vmArm.succeed("uname -m")
-    t.assertIn("${nodes.vmArm.nixpkgs.hostPlatform.qemuArch}", archArm, "machine1 is an ARM VM")
-  '';
-}

pkgs/by-name/op/openresolv/package.nix

@@ -13,8 +13,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "openresolv";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-I86BHiSI3G4xlYRJC99elHw8RyUd3eHdkV5kiEGRXNE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -38,7 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    changelog = "https://github.com/NetworkConfiguration/openresolv/releases/tag/${finalAttrs.src.tag}";
     description = "Program to manage /etc/resolv.conf";
     mainProgram = "resolvconf";
     homepage = "https://roy.marples.name/projects/openresolv";

pkgs/top-level/all-packages.nix

@@ -7981,6 +7981,7 @@ with pkgs;
 
   qemu_test = lowPrio (
     qemu.override {
+      hostCpuOnly = true;
       nixosTestRunner = true;
     }
   );