From ff72dce22366a214db3e480ef4402f4203cdad33 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 13 Jun 2025 01:33:23 +0800 Subject: [PATCH 1/3] linuxHeaders: add linux-kernel team to teams --- pkgs/os-specific/linux/kernel-headers/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix index 722965fed1e1..44342734ada2 100644 --- a/pkgs/os-specific/linux/kernel-headers/default.nix +++ b/pkgs/os-specific/linux/kernel-headers/default.nix @@ -131,10 +131,11 @@ let echo "${version}-default" > $out/include/config/kernel.release ''; - meta = with lib; { + meta = { description = "Header files and scripts for Linux kernel"; - license = licenses.gpl2Only; - platforms = platforms.linux; + license = lib.licenses.gpl2Only; + platforms = lib.platforms.linux; + teams = [ lib.teams.linux-kernel ]; }; }; in From 01aff802f24988fa4cd78a3e6671df47056645ca Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 13 Jun 2025 00:05:07 +0200 Subject: [PATCH 2/3] gamescope: 3.16.11 -> 3.16.12 --- pkgs/by-name/ga/gamescope/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ga/gamescope/package.nix b/pkgs/by-name/ga/gamescope/package.nix index f373a4cce8d5..bba6bcc4a532 100644 --- a/pkgs/by-name/ga/gamescope/package.nix +++ b/pkgs/by-name/ga/gamescope/package.nix @@ -49,14 +49,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gamescope"; - version = "3.16.11"; + version = "3.16.12"; src = fetchFromGitHub { owner = "ValveSoftware"; repo = "gamescope"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-Hj/o5QcjCtMoteKOFU9uZmPIQ28ZlM83BT4MAQTmqQQ="; + hash = "sha256-uh2MHatpgSnEH5LJE+TFCONDM5oxxPPv24vwD/iQh7U="; }; patches = [ From 18cd9132b09da3fc7c508a1663a5671a53088fa2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 13 Jun 2025 05:00:57 +0200 Subject: [PATCH 3/3] nixosTests.sway: skip nagbar test on aarch64-linux for now Since the sway 1.11 release this test has been getting stuck, since the nagbar is not appearing. --- nixos/tests/sway.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index a79e692d24cb..b8634cf482b6 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -181,14 +181,18 @@ machine.send_key("alt-shift-q") machine.wait_until_fails("pgrep --exact gpg") - # Test swaynag: - def get_height(): - return [node['rect']['height'] for node in walk(swaymsg(type="get_tree")) if node['focused']][0] - before = get_height() - machine.send_key("alt-shift-e") - retry(lambda _: get_height() < before) - machine.screenshot("sway_exit") + ${lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 '' + # Test swaynag: + # Broken on aarch64-linux, see https://github.com/NixOS/nixpkgs/issues/416217 + def get_height(): + return [node['rect']['height'] for node in walk(swaymsg(type="get_tree")) if node['focused']][0] + + before = get_height() + machine.send_key("alt-shift-e") + retry(lambda _: get_height() < before) + machine.screenshot("sway_exit") + ''} swaymsg("exec swaylock") machine.wait_until_succeeds("pgrep -xf swaylock")