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

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")

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 = [

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