diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-01-11 03:51:33 +0100 |
| commit | c1e6c6af692c2cf07b4982c0f573acc9f16b78fc (patch) | |
| tree | c436a224f5f71c2a2d91926240b76ceab78d77b9 /nixos/tests | |
| parent | 33aa224777a5077ff1dfa4c8f4653d8aab268d76 (diff) | |
| parent | b0644b461f97d4f7240b089074084c18f521f497 (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/keepassxc.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/libvirtd.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/keepassxc.nix b/nixos/tests/keepassxc.nix index 303be13304057..debb469032a62 100644 --- a/nixos/tests/keepassxc.nix +++ b/nixos/tests/keepassxc.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ({ pkgs, ...} : services.xserver.enable = true; # Regression test for https://github.com/NixOS/nixpkgs/issues/163482 - qt5 = { + qt = { enable = true; platformTheme = "gnome"; style = "adwaita-dark"; diff --git a/nixos/tests/libvirtd.nix b/nixos/tests/libvirtd.nix index 49258fcb93eaf..b6e6040759976 100644 --- a/nixos/tests/libvirtd.nix +++ b/nixos/tests/libvirtd.nix @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { }; testScript = let - nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.hostPlatform.system}; + nixosInstallISO = (import ../release.nix {}).iso_minimal.${pkgs.stdenv.hostPlatform.system}; virshShutdownCmd = if pkgs.stdenv.isx86_64 then "shutdown" else "destroy"; in '' start_all() |