diff --git a/overlays/cross.nix b/overlays/cross.nix
index 0f36a9fec..2ace9d61c 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -411,6 +411,13 @@ in with final; {
   #   ];
   # });
 
+  # 2025/03/10: blocked on libqmi (fixed in staging)
+  gtk4-layer-shell = prev.gtk4-layer-shell.overrideAttrs (upstream: {
+    nativeBuildInputs = upstream.nativeBuildInputs ++ [
+      buildPackages.mesonEmulatorHook
+    ];
+  });
+
   # 2025/01/13: blocked on psqlodbc
   # used by hyprland (which is an indirect dep of waybar, nwg-panel, etc),
   # which it shells out to at runtime (and hence, not ever used by me).
diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index 1744e3f04..3e25f08d5 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/master.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix
@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9";
-  sha256 = "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=";
-  version = "0-unstable-2025-03-08";
+  rev = "91f4fb0a75bcb7e557e19d1640152a33ea5f5b20";
+  sha256 = "sha256-dc3Qp41UiyEhGUEd13B6h8hhKuaebup9vgq5GFa+qPg=";
+  version = "0-unstable-2025-03-10";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index fa387d50f..d33e7a4b5 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -41,7 +41,7 @@ in
   })
 
   (fetchpatch' {
-    # 2025-03-07: testing before merge
+    # 2025-03-09: merged into staging
     name = "libqmi: unbreak cross compilation";
     prUrl = "https://github.com/NixOS/nixpkgs/pull/388297";
     hash = "sha256-iW6b3yNWzWq2CrbtVVFvkhPdNwmRCjUTqLMq4mEHAV4=";
@@ -67,12 +67,6 @@ in
     hash = "sha256-DEim1fNRXfHAtaml6XJnRLVi5KwXm4KIiwZOGU+ePTA=";
   })
 
-  (fetchpatch' {
-    name = "mesa: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/388328";
-    hash = "sha256-Jy9vMaeFrLjCNCI80YvTrqpSDaWQd/Num+mIRcgXCw4=";
-  })
-
   # (fetchpatch' {
   #   # XXX(2025-01-06): patch does not produce valid binaries for cross
   #   name = "lua-language-server: fix cross compiling";
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index c1459db6b..7e01ae04a 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "39279939adf98df0bb548ec23420e9bea650e5dc";
-  sha256 = "sha256-aC0vGtIA9Tdx4LsriRKgThnFQ+W/z1WXV+aTLQTURq0=";
-  version = "0-unstable-2025-03-07";
+  rev = "e8e57d2c31220d1aa920b6dab4ae197805b3c295";
+  sha256 = "sha256-KHKJju8UQ60IlwsVRvyqVKBpMWWiOMq1la4KceQfqzY=";
+  version = "0-unstable-2025-03-09";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index 3a5eacbaf..0643784c0 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "27a49dc3c9a88733aa1d0371ecfec2e13d311347";
-  sha256 = "sha256-57oyfjqiAp+wCGFuvPHVzRoft7AFgXLe4xz8Sub60SA=";
-  version = "0-unstable-2025-03-08";
+  rev = "d435aedd7fa4783b0827e7cc8ca14b4eff759c7e";
+  sha256 = "sha256-NVOVTIxuPS/QRD8T5CFqOhfPqVJKsx7tWufZxW17li8=";
+  version = "0-unstable-2025-03-09";
   branch = "staging";
 }