diff --git a/overlays/cross.nix b/overlays/cross.nix
index c3a47aca8..36215e74b 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -115,10 +115,6 @@ in with final; {
   #     });
   #   };
 
-  # 2024/09/01: upstreaming is unblocked; PR: https://github.com/NixOS/nixpkgs/pull/338790
-  # ayatana-ido = addNativeInputs [ glib ] prev.ayatana-ido;
-  # libayatana-indicator = addNativeInputs [ glib ] prev.libayatana-indicator;
-
   # bamf: required via pantheon.switchboard -> wingpanel -> gala
   # bamf = prev.bamf.overrideAttrs (upstream: {
   #   # "You must have gtk-doc >= 1.0 installed to build documentation"
@@ -887,27 +883,12 @@ in with final; {
   # });
 
   pantheon = prev.pantheon.overrideScope (self: super: {
-    # 2024/09/01: upstreaming is blocked on libayatana-indicator (out for review https://github.com/NixOS/nixpkgs/pull/338790)
+    # 2024/09/17: upstreaming is unblocked
     switchboard-plug-network = super.switchboard-plug-network.overrideAttrs (upstream: {
       nativeBuildInputs = upstream.nativeBuildInputs ++ [
-        buildPackages.gettext  # <for msgfmt
+        buildPackages.gettext  #< for msgfmt
       ];
     });
-    # 2024/09/01: upstreaming is unblocked; out for review: <https://github.com/NixOS/nixpkgs/pull/338799>
-    # switchboard-plug-sound = super.switchboard-plug-sound.overrideAttrs (upstream: {
-    #   # depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
-    #   #   pkg-config  #< so that it can find the right gettext/msgfmt
-    #   # ];
-    #   # everything requires an extra `buildPackages` than if i patched this inside nixpkgs itself: not sure why!
-    #   nativeBuildInputs = upstream.nativeBuildInputs ++ [
-    #     buildPackages.gettext  #< for msgfmt
-    #     # gettext  #< for msgfmt
-    #     buildPackages.glib
-    #   ];
-    #   env.PKG_CONFIG_GIO_2_0_GLIB_COMPILE_RESOURCES = "${lib.getDev buildPackages.buildPackages.glib}/bin/glib-compile-resources";
-
-    #   strictDeps = true;
-    # });
   });
 
   # fixes (meson) "Program 'glib-mkenums mkenums' not found or not executable"
diff --git a/pkgs/additional/nixpkgs/list.nix b/pkgs/additional/nixpkgs/list.nix
index 08f58aff1..25b84f377 100644
--- a/pkgs/additional/nixpkgs/list.nix
+++ b/pkgs/additional/nixpkgs/list.nix
@@ -52,18 +52,6 @@ in
     hash = "sha256-qAoDQuv34gV1Etc/6Kj5U0c3HHsPAUR1Fshb456i5pA=";
   })
 
-  (fetchpatch' {
-    title = "ayatana-ido,libayatana-indicator: move to pkgs/by-name and fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/338790";
-    hash = "sha256-BbnXCFs5zD2IQhzvlH1bexEExg/kMf+N+WnXwdCdxP0=";
-  })
-
-  (fetchpatch' {
-    title = "pantheon.switchboard-plug-sound: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/338799";
-    hash = "sha256-q/WhUH+NbeMALApCgSpQqe9eQ9jcod0EqEnTc19Qut4=";
-  })
-
   # (fetchpatch' {
   #   # this causes a rebuild of systemd and everything above it:
   #   # PR against staging is live: <https://github.com/NixOS/nixpkgs/pull/332399>