diff --git a/overlays/cross.nix b/overlays/cross.nix
index 6cc8d8366..f1c068a54 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -387,7 +387,7 @@ in with final; {
   #     });
   #   };
 
-  # 2024/02/27: upstreaming is unblocked
+  # 2024/05/13: upstreaming is unblocked; out for review: <https://github.com/NixOS/nixpkgs/pull/305241>
   appstream = prev.appstream.overrideAttrs (upstream: {
     # fixes: "Message: Native appstream required for cross-building"
     # error introduced in:
@@ -815,11 +815,12 @@ in with final; {
   });
 
   # 2024/05/08: fix: "meson.build:85:11: ERROR: Dependency "dbus-1" not found, tried pkgconfig".
+  # 2024/05/13: upstreaming is bloked by dbus-python (fixed in staging), appstream (out for PR)
   gnome-online-accounts = mvToBuildInputs [ dbus ] prev.gnome-online-accounts;
 
   gnome = prev.gnome.overrideScope (self: super: {
     evolution-data-server = super.evolution-data-server.overrideAttrs (upstream: {
-      # 2023/12/08: upstreaming is unblocked, but depends on webkitgtk 4.1
+      # 2024/05/13: upstreaming is blocked by appstream (out for PR), libgweather (out for PR)
       cmakeFlags = upstream.cmakeFlags ++ [
         "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
         "-DENABLE_TESTS=no"
@@ -2073,12 +2074,12 @@ in with final; {
 
   # 2024/02/29: upstreaming is blocked on libei (unless Xwayland config option is disabled in nixpkgs)
   #             out for PR: <https://github.com/NixOS/nixpkgs/pull/292415>
-  wlroots = prev.wlroots.overrideAttrs (upstream: {
-    nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
-      # incorrectly specified as `buildInputs` in nixpkgs.
-      hwdata
-    ];
-  });
+  # wlroots = prev.wlroots.overrideAttrs (upstream: {
+  #   nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
+  #     # incorrectly specified as `buildInputs` in nixpkgs.
+  #     hwdata
+  #   ];
+  # });
 
   # wrapFirefox = prev.wrapFirefox.override {
   #   buildPackages = buildPackages // {
@@ -2092,6 +2093,7 @@ in with final; {
   #   };
   # };
 
+  # fixes `hostPrograms.moby.neovim` (but breaks eval of `hostPkgs.moby.neovim` :o)
   wrapNeovimUnstable = neovim: config: (prev.wrapNeovimUnstable neovim config).overrideAttrs (upstream: {
     # nvim wrapper has a sanity check that the plugins will load correctly.
     # this is effectively a check phase and should be rewritten as such