movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-14 14:10:33 +03:00
Code Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse source
This commit is contained in:
Martin Weinelt 2023-01-11 03:51:33 +01:00
commit c1e6c6af69
291 changed files with 4851 additions and 1651 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/keepassxc.nix
View file

@ -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";

2
nixos/tests/libvirtd.nix
View file

@ -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()