diff --git a/overlays/cross.nix b/overlays/cross.nix
index 23456eb36..befc1c3f7 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -239,7 +239,7 @@ in with final; {
     cargo = crossCargo;  #< fixes openssl not being able to find its library
   };
 
-  # 2024/12/16: upstreaming is blocked on gnome-online-accounts
+  # 2024/12/18: upstreaming is unblocked
   evolution-data-server = prev.evolution-data-server.overrideAttrs (upstream: {
     cmakeFlags = upstream.cmakeFlags ++ [
       "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}"
@@ -272,7 +272,7 @@ in with final; {
     # ];
   });
 
-  # 2024/08/12: upstreaming is blocked on gnome-user-share (apache-httpd)
+  # 2024/08/12: upstreaming is blocked on poppler-glib (via nautilus)
   # fixes: "src/meson.build:106:0: ERROR: Program 'glib-compile-resources' not found or not executable"
   # file-roller = mvToNativeInputs [ glib ] prev.file-roller;
 
@@ -384,6 +384,10 @@ in with final; {
   #   });
   # });
 
+  # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus
+  # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
+  # gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;
+
   # 2024/11/19: upstreaming is blocked on qtx11extras (via zbar)
   gnome-frog = prev.gnome-frog.override {
     blueprint-compiler = wrapBlueprint [
@@ -397,8 +401,12 @@ in with final; {
     ];
   };
 
+  # 2024/12/18: upstreaming is blocked on gnome-shell
+  # fixes: "gdbus-codegen not found or executable"
+  # gnome-session = mvToNativeInputs [ glib ] super.gnome-session;
+
   gnome-settings-daemon = prev.gnome-settings-daemon.overrideAttrs (orig: {
-    # 2024/12/16: upstreaming is blocked on poppler-glib (should be fixed in staging?)
+    # 2024/12/18: upstreaming is blocked on poppler-glib (should be fixed in staging?)
     # gsd is required by xdg-desktop-portal-gtk
     # pkg-config solves: "plugins/power/meson.build:22:0: ERROR: Dependency lookup for glib-2.0 with method 'pkgconfig' failed: Pkg-config binary for machine build machine not found."
     # stdenv.cc fixes: "plugins/power/meson.build:60:0: ERROR: No build machine compiler for 'plugins/power/gsd-power-enums-update.c'"
@@ -411,67 +419,37 @@ in with final; {
     '';
   });
 
-  # 2024/08/12: upstreaming is blocked on gnome-user-share (apache-httpd)
+  # 2024/12/18: upstreaming is blocked on poppler-glib, gnome-settings-daemon
+  # gnome-shell = super.gnome-shell.overrideAttrs (orig: {
+  #   # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
+  #   # does not fix "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory"  (python import failure)
+  #   nativeBuildInputs = orig.nativeBuildInputs ++ [ gjs gobject-introspection ];
+  #   # try to reduce gobject-introspection/shew dependencies
+  #   mesonFlags = [
+  #     "-Dextensions_app=false"
+  #     "-Dextensions_tool=false"
+  #     "-Dman=false"
+  #   ];
+  #   # fixes "gvc| Build-time dependency gobject-introspection-1.0 found: NO"
+  #   # inspired by gupnp_1_6
+  #   # outputs = [ "out" "dev" ]
+  #   #   ++ lib.optionals (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform) [ "devdoc" ];
+  #   # mesonFlags = [
+  #   #   "-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
+  #   # ];
+  # });
+  # gnome-shell = super.gnome-shell.overrideAttrs (upstream: {
+  #   nativeBuildInputs = upstream.nativeBuildInputs ++ [
+  #     gjs  # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
+  #   ];
+  # });
+
+  # 2024/08/12: upstreaming is blocked on gnome-user-share
   # gnome-terminal = prev.gnome-terminal.overrideAttrs (orig: {
   #   # fixes "meson.build:343:0: ERROR: Dependency "libpcre2-8" not found, tried pkgconfig"
   #   buildInputs = orig.buildInputs ++ [ pcre2 ];
   # });
 
-  # gnome = prev.gnome.overrideScope (self: super: {
-  #   # 2024/05/31: upstreaming is blocked by a LOT: qtbase, qtsvg, webp-pixbuf-loader, libgweather, gnome-color-manager, appstream, apache-httpd, ibus
-  #   # fixes "subprojects/gvc/meson.build:30:0: ERROR: Program 'glib-mkenums mkenums' not found or not executable"
-  #   # gnome-control-center = mvToNativeInputs [ glib ] super.gnome-control-center;
-  #   # 2024/08/12: upstreaming is blocked on ibus, libgweather
-  #   # gnome-shell = super.gnome-shell.overrideAttrs (orig: {
-  #   #   # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
-  #   #   # does not fix "_giscanner.cpython-310-x86_64-linux-gnu.so: cannot open shared object file: No such file or directory"  (python import failure)
-  #   #   nativeBuildInputs = orig.nativeBuildInputs ++ [ gjs gobject-introspection ];
-  #   #   # try to reduce gobject-introspection/shew dependencies
-  #   #   mesonFlags = [
-  #   #     "-Dextensions_app=false"
-  #   #     "-Dextensions_tool=false"
-  #   #     "-Dman=false"
-  #   #   ];
-  #   #   # fixes "gvc| Build-time dependency gobject-introspection-1.0 found: NO"
-  #   #   # inspired by gupnp_1_6
-  #   #   # outputs = [ "out" "dev" ]
-  #   #   #   ++ lib.optionals (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform) [ "devdoc" ];
-  #   #   # mesonFlags = [
-  #   #   #   "-Dgtk_doc=${lib.boolToString (prev.stdenv.buildPlatform == prev.stdenv.hostPlatform)}"
-  #   #   # ];
-  #   # });
-  #   # gnome-shell = super.gnome-shell.overrideAttrs (upstream: {
-  #   #   nativeBuildInputs = upstream.nativeBuildInputs ++ [
-  #   #     gjs  # fixes "meson.build:128:0: ERROR: Program 'gjs' not found or not executable"
-  #   #   ];
-  #   # });
-  #   # gnome-settings-daemon43 = super.gnome-settings-daemon43.overrideAttrs (orig: {
-  #   #   postPatch = orig.postPatch + ''
-  #   #     substituteInPlace plugins/meson.build \
-  #   #       --replace-fail "disabled_plugins = []" "disabled_plugins = ['power']"
-  #   #   '';
-  #   # });
-
-  #   # 2024/08/12: upstreaming is blocked on gnome-shell (ibus, libgweather)
-  #   # fixes: "gdbus-codegen not found or executable"
-  #   # gnome-session = mvToNativeInputs [ glib ] super.gnome-session;
-
-  #   # mutter = super.mutter.overrideAttrs (orig: {
-  #   #   # 2024/08/12: upstreaming is blocked on libgweather (via gnome-settings-daemon)
-  #   #   # N.B.: not all of this suitable to upstreaming, as-is.
-  #   #   # mesa and xorgserver are removed here because they *themselves* don't build for `buildPackages` (temporarily: 2023/10/26)
-  #   #   nativeBuildInputs = lib.subtractLists [ mesa xorg.xorgserver ] orig.nativeBuildInputs;
-  #   #   buildInputs = orig.buildInputs ++ [
-  #   #     mesa  # fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
-  #   #     libGL  # fixes "meson.build:184:11: ERROR: Dependency "gl" not found, tried pkgconfig and system"
-  #   #   ];
-  #   #   # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
-  #   #   mesonFlags = lib.remove "-Ddocs=true" orig.mesonFlags;
-  #   #   outputs = lib.remove "devdoc" orig.outputs;
-  #   #   postInstall = lib.replaceStrings [ "${glib.dev}" ] [ "${buildPackages.glib.dev}" ] orig.postInstall;
-  #   # });
-  # });
-
   # gnome2 = prev.gnome2.overrideScope (self: super: {
   #   # 2024/05/31: upstreaming is blocked on gconf (ORBit2)
   #   # gnome_vfs = (
@@ -595,6 +573,22 @@ in with final; {
     zigBuildFlags = [ "-Dtarget=aarch64-linux-gnu" ];
   });
 
+  # 2024/12/18: upstreaming is blocked on poppler-glib
+  # mutter = super.mutter.overrideAttrs (orig: {
+  #   # 2024/08/12: upstreaming is blocked on libgweather (via gnome-settings-daemon)
+  #   # N.B.: not all of this suitable to upstreaming, as-is.
+  #   # mesa and xorgserver are removed here because they *themselves* don't build for `buildPackages` (temporarily: 2023/10/26)
+  #   nativeBuildInputs = lib.subtractLists [ mesa xorg.xorgserver ] orig.nativeBuildInputs;
+  #   buildInputs = orig.buildInputs ++ [
+  #     mesa  # fixes "meson.build:237:2: ERROR: Dependency "gbm" not found, tried pkgconfig"
+  #     libGL  # fixes "meson.build:184:11: ERROR: Dependency "gl" not found, tried pkgconfig and system"
+  #   ];
+  #   # Run-time dependency gi-docgen found: NO (tried pkgconfig and cmake)
+  #   mesonFlags = lib.remove "-Ddocs=true" orig.mesonFlags;
+  #   outputs = lib.remove "devdoc" orig.outputs;
+  #   postInstall = lib.replaceStrings [ "${glib.dev}" ] [ "${buildPackages.glib.dev}" ] orig.postInstall;
+  # });
+
   # 2024/12/16: upstreaming is blocked on poppler-glib, gnome-user-share
   nautilus = prev.nautilus.overrideAttrs (upstream: {
     mesonFlags = upstream.mesonFlags ++ [