diff options
98 files changed, 4750 insertions, 529 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 2c611f82315c..36ddea9f5e0d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2726,6 +2726,12 @@ github = "bmwalters"; githubId = 4380777; }; + bnlrnz = { + github = "bnlrnz"; + githubId = 11310385; + name = "Ben Lorenz"; + email = "bnlrnz@gmail.com"; + }; bobakker = { email = "bobakk3r@gmail.com"; github = "bobakker"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7fcfef5546e2..9389514fcba5 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -518,6 +518,7 @@ with lib.maintainers; { cpages dschrempf edwtjo + kazenyuk minijackson peterhoeg sephalon diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 469144aef4e0..e11867b69107 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -38,6 +38,8 @@ in { ]); }; + networking.networkmanager.enable = lib.mkDefault true; + systemd.packages = with pkgs.lomiri; [ hfd-service lomiri-download-manager @@ -73,6 +75,8 @@ in { ayatana-indicator-session ]) ++ (with pkgs.lomiri; [ telephony-service + ] ++ lib.optionals config.networking.networkmanager.enable [ + lomiri-indicator-network ]); }; @@ -111,6 +115,8 @@ in { "/share/lomiri-app-launch" # TODO Try to get maliit stuff working "/share/maliit/plugins" + # At least the network indicator is still under the unity name, due to leftover Unity-isms + "/share/unity" # Data "/share/locale" # TODO LUITK hardcoded default locale path, fix individual apps to not rely on it "/share/sounds" diff --git a/nixos/modules/virtualisation/lxd-virtual-machine.nix b/nixos/modules/virtualisation/lxd-virtual-machine.nix index 92434cb9babf..2768e7c25966 100644 --- a/nixos/modules/virtualisation/lxd-virtual-machine.nix +++ b/nixos/modules/virtualisation/lxd-virtual-machine.nix @@ -45,6 +45,10 @@ in { boot.kernelParams = ["console=tty1" "console=${serialDevice}"]; + services.udev.extraRules = '' + SUBSYSTEM=="cpu", CONST{arch}=="x86-64", TEST=="online", ATTR{online}=="0", ATTR{online}="1" + ''; + virtualisation.lxd.agent.enable = lib.mkDefault true; }; } diff --git a/nixos/tests/incus/virtual-machine.nix b/nixos/tests/incus/virtual-machine.nix index ab378c7b9490..48178aaed32c 100644 --- a/nixos/tests/incus/virtual-machine.nix +++ b/nixos/tests/incus/virtual-machine.nix @@ -57,5 +57,14 @@ in with subtest("lxd-agent has a valid path"): machine.succeed("incus exec ${instance-name} -- bash -c 'true'") + + with subtest("guest supports cpu hotplug"): + machine.succeed("incus config set ${instance-name} limits.cpu=1") + count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip()) + assert count == 1, f"Wrong number of CPUs reported, want: 1, got: {count}" + + machine.succeed("incus config set ${instance-name} limits.cpu=2") + count = int(machine.succeed("incus exec ${instance-name} -- nproc").strip()) + assert count == 2, f"Wrong number of CPUs reported, want: 2, got: {count}" ''; }) diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index c1e777873b08..9d6337e9977c 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -253,22 +253,35 @@ in { with subtest("ayatana indicators work"): open_starter() machine.send_chars("Indicators\n") - machine.wait_for_text(r"(Indicators|Client|List|datetime|session)") + machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)") machine.screenshot("indicators_open") # Element tab order within the indicator menus is not fully deterministic # Only check that the indicators are listed & their items load + with subtest("lomiri indicator network works"): + # Select indicator-network + machine.send_key("tab") + # Don't go further down, first entry + machine.send_key("ret") + machine.wait_for_text(r"(Flight|Wi-Fi)") + machine.screenshot("indicators_network") + + machine.send_key("shift-tab") + machine.send_key("ret") + machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)") + with subtest("ayatana indicator datetime works"): # Select ayatana-indicator-datetime machine.send_key("tab") + machine.send_key("down") machine.send_key("ret") machine.wait_for_text("Time and Date Settings") machine.screenshot("indicators_timedate") machine.send_key("shift-tab") machine.send_key("ret") - machine.wait_for_text(r"(Indicators|Client|List|datetime|session)") + machine.wait_for_text(r"(Indicators|Client|List|network|datetime|session)") with subtest("ayatana indicator session works"): # Select ayatana-indicator-session diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index b86142ed47b5..5c7d302346e3 100644 --- a/ |