diff --git a/overlays/cross.nix b/overlays/cross.nix
index 4d349b0ca..311764e2d 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -686,6 +686,9 @@ in with final; {
   #   ];
   # });
 
+  # 2025/05/05: upstreaming blocked on libcdio (via gvfs -> libcdio-paranoia)
+  swaynotificationcenter = mvToNativeInputs [ buildPackages.wayland-scanner ] prev.swaynotificationcenter;
+
   # 2024/11/19: upstreaming is unblocked
   tangram = prev.tangram.overrideAttrs (upstream: {
     # gsjpack has a shebang for the host gjs. patchShebangs --build doesn't fix that: just manually specify the build gjs.
diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index 87ef944e3..8bd753c92 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 = "84d5e28e74e53b8daa0d8a0a79435636a8b7e147";
-  sha256 = "sha256-5i1NTJW0OABcvi3b3ueawpxKYVybSrV6fMKbO2EA52A=";
-  version = "0-unstable-2025-05-04";
+  rev = "fa24fdbb9c269928fb5cb8c6240f303d2b05c593";
+  sha256 = "sha256-HU3kkIoTmDeZu1FfPjfL2o8zfpPKOvRKwCrnT3OXuw4=";
+  version = "0-unstable-2025-05-05";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index c81c943b7..10e81f4c4 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 = "7aeb16e7ffcb506b7b1e441be76bc068937db438";
-  sha256 = "sha256-dVSardAL0viMtFwQg4FWgfTeNM3PFt0vUxJDMFljUFc=";
-  version = "0-unstable-2025-05-04";
+  rev = "2a6b8f17a385c0a10c2d027f4b55d6f1c8df702c";
+  sha256 = "sha256-H8XekRUCTtCFiWBI4jQuuEFvmme73jFNbyzDwxURDbo=";
+  version = "0-unstable-2025-05-05";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index 917130413..55a5c3d02 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 = "05d05a92fa452e52bee67e5114a7ea7f0b2fda8c";
-  sha256 = "sha256-luCGKI+NdeAUDvWhoE+jr3e3mEyJZ9V19LRs673JrMc=";
-  version = "0-unstable-2025-05-04";
+  rev = "fd607c5ec1c7f5cf70a7e45cc6d0a91bdf58eacd";
+  sha256 = "sha256-jxXjuvwWq7Mwe+b4Vw/nd6dQaa3cuWEJHcvnah4YX4A=";
+  version = "0-unstable-2025-05-05";
   branch = "staging";
 }