nixosTests: fix eval

nixos/tests/all-tests.nix

@@ -616,8 +616,14 @@ in
   pyload = runTest ./pyload.nix;
   oci-containers = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./oci-containers.nix { };
   odoo = runTest ./odoo.nix;
-  odoo17 = handleTest ./odoo.nix { package = pkgs.odoo17; };
+  odoo17 = runTest {
-  odoo16 = handleTest ./odoo.nix { package = pkgs.odoo16; };
+    imports = [ ./odoo.nix ];
+    _module.args.package = pkgs.odoo17;
+  };
+  odoo16 = runTest {
+    imports = [ ./odoo.nix ];
+    _module.args.package = pkgs.odoo16;
+  };
   oncall = runTest ./web-apps/oncall.nix;
   # 9pnet_virtio used to mount /nix partition doesn't support
   # hibernation. This test happens to work on x86_64-linux but
@@ -1297,8 +1303,9 @@ in
   systemd-initrd-btrfs-raid = runTest ./systemd-initrd-btrfs-raid.nix;
   systemd-initrd-luks-fido2 = runTest ./systemd-initrd-luks-fido2.nix;
   systemd-initrd-luks-keyfile = runTest ./systemd-initrd-luks-keyfile.nix;
-  systemd-initrd-luks-empty-passphrase = handleTest ./initrd-luks-empty-passphrase.nix {
+  systemd-initrd-luks-empty-passphrase = runTest {
-    systemdStage1 = true;
+    imports = [ ./initrd-luks-empty-passphrase.nix ];
+    _module.args.systemdStage1 = true;
   };
   systemd-initrd-luks-password = runTest ./systemd-initrd-luks-password.nix;
   systemd-initrd-luks-tpm2 = runTest ./systemd-initrd-luks-tpm2.nix;
@@ -1310,7 +1317,10 @@ in
     "x86_64-linux"
     "i686-linux"
   ] ./initrd-network-openvpn { systemdStage1 = true; };
-  systemd-initrd-shutdown = handleTest ./systemd-shutdown.nix { systemdStage1 = true; };
+  systemd-initrd-shutdown = runTest {
+    imports = [ ./systemd-shutdown.nix ];
+    _module.args.systemdStage1 = true;
+  };
   systemd-initrd-simple = runTest ./systemd-initrd-simple.nix;
   systemd-initrd-swraid = runTest ./systemd-initrd-swraid.nix;
   systemd-initrd-vconsole = runTest ./systemd-initrd-vconsole.nix;

nixos/tests/breitbandmessung.nix

@@ -3,6 +3,8 @@
   name = "breitbandmessung";
   meta.maintainers = with lib.maintainers; [ b4dm4n ];
 
+  node.pkgsReadOnly = false;
+
   nodes.machine =
     { pkgs, ... }:
     {

nixos/tests/brscan5.nix

@@ -1,16 +1,12 @@
 # integration tests for brscan5 sane driver
-#
+{ lib, ... }:
-
-{ pkgs, ... }:
 {
   name = "brscan5";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ mattchrist ];
-    maintainers = [ mattchrist ];
-  };
 
-  nodes.machine =
+  node.pkgsReadOnly = false;
-    { pkgs, ... }:
+
-    {
+  nodes.machine = {
     nixpkgs.config.allowUnfree = true;
     hardware.sane = {
       enable = true;

nixos/tests/consul.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 
 let
   # Settings for both servers and agents
@@ -117,6 +117,8 @@ in
 {
   name = "consul";
 
+  node.pkgsReadOnly = false;
+
   nodes = {
     server1 = server 0;
     server2 = server 1;

nixos/tests/deconz.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 let
   httpPort = 800;
 in
@@ -9,14 +9,9 @@ in
     bjornfor
   ];
 
-  nodes.machine =
+  node.pkgsReadOnly = false;
-    {
+
-      config,
+  nodes.machine = {
-      pkgs,
-      lib,
-      ...
-    }:
-    {
     nixpkgs.config.allowUnfree = true;
     services.deconz = {
       enable = true;

nixos/tests/discourse.nix

@@ -4,9 +4,9 @@
 #  3. replying to that message via email.
 
 {
+  package,
   pkgs,
   lib,
-  package ? pkgs.discourse,
   ...
 }:
 let
@@ -24,9 +24,9 @@ let
 in
 {
   name = "discourse";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ talyz ];
-    maintainers = [ talyz ];
+
-  };
+  _module.args.package = lib.mkDefault pkgs.discourse;
 
   nodes.discourse =
     { nodes, ... }:
@@ -62,7 +62,7 @@ in
 
       services.discourse = {
         enable = true;
-        inherit admin package;
+        inherit admin;
         hostname = discourseDomain;
         sslCertificate = "${certs.${discourseDomain}.cert}";
         sslCertificateKey = "${certs.${discourseDomain}.key}";

nixos/tests/fanout.nix

@@ -1,28 +1,15 @@
-{
+{ lib, ... }:
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}:
-{ lib, pkgs, ... }:
 {
   name = "fanout";
-  meta.maintainers = [ lib.maintainers.therishidesai ];
+  meta.maintainers = with lib.maintainers; [ therishidesai ];
 
-  nodes =
+  nodes.machine = {
-    let
-      cfg =
-        { ... }:
-        {
     services.fanout = {
       enable = true;
       fanoutDevices = 2;
       bufferSize = 8192;
     };
   };
-    in
-    {
-      machine = cfg;
-    };
 
   testScript = ''
     start_all()

nixos/tests/gnome-extensions.nix

@@ -3,6 +3,8 @@
   name = "gnome-extensions";
   meta.maintainers = [ ];
 
+  node.pkgsReadOnly = false;
+
   nodes.machine =
     { pkgs, ... }:
     {
@@ -21,17 +23,15 @@
 
       # Configure GDM
       services.xserver.enable = true;
-      services.xserver.displayManager = {
+      services.xserver.displayManager.gdm = {
-        gdm = {
         enable = true;
         debug = true;
         wayland = true;
       };
-        autoLogin = {
+      services.displayManager.autoLogin = {
         enable = true;
         user = "alice";
       };
-      };
 
       # Configure Gnome
       services.xserver.desktopManager.gnome.enable = true;

nixos/tests/initrd-luks-empty-passphrase.nix

@@ -1,22 +1,21 @@
 {
-  system ? builtins.currentSystem,
+  systemdStage1,
-  config ? { },
+  lib,
-  pkgs ? import ../.. { inherit system config; },
+  pkgs,
-  systemdStage1 ? false,
+  ...
 }:
-{ lib, pkgs, ... }:
 let
-
   keyfile = pkgs.writeText "luks-keyfile" ''
     MIGHAoGBAJ4rGTSo/ldyjQypd0kuS7k2OSsmQYzMH6TNj3nQ/vIUjDn7fqa3slt2
     gV6EK3TmTbGc4tzC1v4SWx2m+2Bjdtn4Fs4wiBwn1lbRdC6i5ZYCqasTWIntWn+6
     FllUkMD5oqjOR/YcboxG8Z3B5sJuvTP9llsF+gnuveWih9dpbBr7AgEC
   '';
-
 in
 {
   name = "initrd-luks-empty-passphrase";
 
+  _module.args.systemdStage1 = lib.mkDefault false;
+
   nodes.machine =
     { pkgs, ... }:
     {

nixos/tests/minecraft-server.nix

@@ -3,12 +3,12 @@ let
   rcon-pass = "foobar";
   rcon-port = 43000;
 in
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   name = "minecraft-server";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ nequissimus ];
-    maintainers = [ nequissimus ];
+
-  };
+  node.pkgsReadOnly = false;
 
   nodes.server =
     { ... }:

nixos/tests/odoo.nix

@@ -1,17 +1,16 @@
 {
-  pkgs,
+  package,
   lib,
-  package ? pkgs.odoo,
+  pkgs,
   ...
 }:
 {
   name = "odoo";
   meta.maintainers = with lib.maintainers; [ mkg20001 ];
 
-  nodes = {
+  _module.args.package = lib.mkDefault pkgs.odoo;
-    server =
+
-      { ... }:
+  nodes.server = {
-      {
     services.nginx = {
       enable = true;
       recommendedProxySettings = true;
@@ -25,11 +24,8 @@
       domain = "localhost";
     };
   };
-  };
 
-  testScript =
+  testScript = ''
-    { nodes, ... }:
-    ''
     server.wait_for_unit("odoo.service")
     server.wait_until_succeeds("curl -s http://localhost:8069/web/database/selector | grep '<title>Odoo</title>'")
     server.succeed("curl -s http://localhost/web/database/selector | grep '<title>Odoo</title>'")

nixos/tests/openldap.nix

@@ -54,7 +54,7 @@ in
   name = "openldap";
 
   nodes.machine =
-    { pkgs, ... }:
+    { config, pkgs, ... }:
     {
       environment.etc."openldap/root_password".text = "notapassword";
 
@@ -124,6 +124,8 @@ in
           configuration =
             { ... }:
             {
+              nixpkgs.hostPlatform = config.nixpkgs.hostPlatform;
+
               users.ldap = ldapClientConfig;
               services.openldap = {
                 enable = true;
@@ -133,6 +135,7 @@ in
         };
       };
     };
+
   testScript =
     { nodes, ... }:
     let

nixos/tests/outline.nix

@@ -15,8 +15,9 @@ in
 
   meta.maintainers = lib.teams.cyberus.members;
 
-  nodes = {
+  node.pkgsReadOnly = false;
-    outline =
+
+  nodes.outline =
     { pkgs, config, ... }:
     {
       nixpkgs.config.allowUnfree = true;
@@ -36,7 +37,6 @@ in
         inherit rootCredentialsFile;
       };
     };
-  };
 
   testScript = ''
     machine.wait_for_unit("minio.service")

nixos/tests/quake3.nix

@@ -1,7 +1,5 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
-
 let
-
   # Build Quake with coverage instrumentation.
   overrides = pkgs: {
     quake3game = pkgs.quake3game.override (args: {
@@ -23,7 +21,6 @@ let
 
   client =
     { pkgs, ... }:
-
     {
       imports = [ ./common/x11.nix ];
       hardware.graphics.enable = true;
@@ -31,14 +28,12 @@ let
       nixpkgs.config.packageOverrides = overrides;
       nixpkgs.config.allowUnfreePredicate = unfreePredicate;
     };
-
 in
-
+{
-rec {
   name = "quake3";
-  meta = with lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ domenkozar ];
-    maintainers = [ domenkozar ];
+
-  };
+  node.pkgsReadOnly = false;
 
   # TODO: lcov doesn't work atm
   #makeCoverageReport = true;
@@ -46,7 +41,6 @@ rec {
   nodes = {
     server =
       { pkgs, ... }:
-
       {
         systemd.services.quake3-server = {
           wantedBy = [ "multi-user.target" ];
@@ -96,5 +90,4 @@ rec {
     client2.shutdown()
     server.stop_job("quake3-server")
   '';
-
 }

nixos/tests/sabnzbd.nix

@@ -1,12 +1,12 @@
-{ pkgs, lib, ... }:
+{ lib, ... }:
 {
   name = "sabnzbd";
-  meta = with pkgs.lib; {
+  meta.maintainers = with lib.maintainers; [ jojosch ];
-    maintainers = with maintainers; [ jojosch ];
+
-  };
+  node.pkgsReadOnly = false;
 
   nodes.machine =
-    { pkgs, ... }:
+    { lib, ... }:
     {
       services.sabnzbd = {
         enable = true;

nixos/tests/squid.nix

@@ -43,9 +43,9 @@ let
 in
 {
   name = "squid";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ cobalt ];
-    maintainers = [ cobalt ];
+
-  };
+  node.pkgsReadOnly = false;
 
   nodes = {
     client =

nixos/tests/systemd-analyze.nix

@@ -1,14 +1,14 @@
 {
-  pkgs,
+  latestKernel,
-  latestKernel ? false,
+  lib,
   ...
 }:
 
 {
   name = "systemd-analyze";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ raskin ];
-    maintainers = [ raskin ];
+
-  };
+  _module.args.latestKernel = lib.mkDefault false;
 
   nodes.machine =
     { pkgs, lib, ... }:

nixos/tests/systemd-shutdown.nix

@@ -1,6 +1,7 @@
 {
+  systemdStage1,
+  lib,
   pkgs,
-  systemdStage1 ? false,
   ...
 }:
 let
@@ -8,9 +9,9 @@ let
 in
 {
   name = "systemd-shutdown";
-  meta = with pkgs.lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ das_j ];
-    maintainers = [ das_j ];
+
-  };
+  _module.args.systemdStage1 = lib.mkDefault false;
 
   nodes.machine = {
     imports = [ ../modules/profiles/minimal.nix ];

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

@@ -10,20 +10,23 @@ let
       (lib.take 2)
       (lib.concatStringsSep ".")
     ];
-  oldApiVersion = apiVersion pkgs."${oldNetbox}".version;
+  oldApiVersion = apiVersion pkgs.${oldNetbox}.version;
-  newApiVersion = apiVersion pkgs."${newNetbox}".version;
+  newApiVersion = apiVersion pkgs.${newNetbox}.version;
 in
 {
   name = "netbox-upgrade";
 
-  meta = with lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [
-    maintainers = [
     minijackson
     raitobezarius
   ];
-  };
+
+  node.pkgsReadOnly = false;
 
   nodes.machine =
+    let
+      pkgs' = pkgs;
+    in
     { config, pkgs, ... }:
     {
       virtualisation.memorySize = 2048;
@@ -31,7 +34,7 @@ in
         enable = true;
         # Pick the NetBox package from this config's "pkgs" argument,
         # so that `nixpkgs.config.permittedInsecurePackages` works
-        package = pkgs."${oldNetbox}";
+        package = pkgs.${oldNetbox};
         secretKeyFile = pkgs.writeText "secret" ''
           abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789
         '';
@@ -53,9 +56,9 @@ in
 
       networking.firewall.allowedTCPPorts = [ 80 ];
 
-      nixpkgs.config.permittedInsecurePackages = [ pkgs."${oldNetbox}".name ];
+      nixpkgs.config.permittedInsecurePackages = [ pkgs'.${oldNetbox}.name ];
 
-      specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs."${newNetbox}";
+      specialisation.upgrade.configuration.services.netbox.package = lib.mkForce pkgs.${newNetbox};
     };
 
   testScript =

nixos/tests/without-nix.nix

@@ -1,13 +1,11 @@
 { lib, ... }:
 {
   name = "without-nix";
-  meta = with lib.maintainers; {
+  meta.maintainers = with lib.maintainers; [ ericson2314 ];
-    maintainers = [ ericson2314 ];
-  };
 
-  nodes.machine =
+  node.pkgsReadOnly = false;
-    { ... }:
+
-    {
+  nodes.machine = {
     nix.enable = false;
     nixpkgs.overlays = [
       (self: super: {