From 4dbce1baaec87f2eec5aa2ec91cba1d21ad04a93 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sun, 31 Aug 2025 23:35:01 +0000
Subject: [PATCH] cross: update upstreaming status

---
 overlays/cross.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index a286cf840..2bf4ff81a 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -120,7 +120,7 @@ in with final; {
   # };
 
 
-  # 2025/07/27: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet
+  # 2025/08/31: upstreaming is unblocked, but a cleaner solution than this doesn't seem to exist yet
   confy = prev.confy.overrideAttrs (upstream: {
     # meson's `python.find_installation` method somehow just doesn't support cross compilation.
     # - <https://mesonbuild.com/Python-module.html#find_installation>
@@ -156,14 +156,14 @@ in with final; {
   #   cargo = crossCargo;
   # };
 
-  # 2025/07/27: upstreaming is unblocked
+  # 2025/08/31: upstreaming is blocked on mailutils -> gss -> shishi
   # emacs = prev.emacs.override {
   #   nativeComp = false;  # will be renamed to `withNativeCompilation` in future
   #   # future: we can specify 'action-if-cross-compiling' to actually invoke the test programs:
   #   # <https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Runtime.html>
   # };
 
-  # 2025/07/27: upstreaming is unblocked
+  # 2025/08/31: upstreaming is unblocked
   # firejail = prev.firejail.overrideAttrs (upstream: {
   #   # firejail executes its build outputs to produce the default filter list.
   #   # i think we *could* copy the default filters from pkgsBuildBuild, but that doesn't seem future proof
@@ -177,7 +177,7 @@ in with final; {
   #   '');
   # });
 
-  # 2025/07/27: upstreaming is unblocked
+  # 2025/08/31: upstreaming is unblocked
   # flare-signal = prev.flare-signal.overrideAttrs (upstream: {
   #    env = let
   #      inherit buildPackages stdenv rust;
@@ -208,7 +208,7 @@ in with final; {
   # fixes: "gdbus-codegen not found or executable"
   # gnome-session = mvToNativeInputs [ glib ] super.gnome-session;
 
-  # 2025/07/27: upstreaming is blocked on ibus, evolution-data-server -> gnome-online-accounts -> gvfs -> ...
+  # 2025/08/31: upstreaming is blocked on evolution-data-server -> gnome-online-accounts -> gvfs -> ... -> ruby
   # 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)
@@ -288,13 +288,6 @@ in with final; {
   #   nativeBuildInputs = lib.remove [ qt6.wrapQtAppsHook ] upstream.nativeBuildInputs;
   # });
 
-  # 2025/07/27: upstreaming is unblocked -- but is this necessary?
-  # koreader = prev.koreader.overrideAttrs (upstream: {
-  #   nativeBuildInputs = upstream.nativeBuildInputs ++ [
-  #     autoPatchelfHook
-  #   ];
-  # });
-
   # lemoa = prev.lemoa.override { cargo = crossCargo; };
 
   # libsForQt5 = prev.libsForQt5.overrideScope (self: super: {
@@ -418,7 +411,7 @@ in with final; {
   #   # buildInputs = lib.remove gnupg upstream.buildInputs;
   # });
 
-  # 2025/08/17: upstreaming is unblocked, but most of this belongs in _oils_ repo
+  # 2025/08/31: upstreaming is unblocked, but most of this belongs in _oils_ repo
   oils-for-unix = prev.oils-for-unix.overrideAttrs (upstream: {
     postPatch = (upstream.postPatch or "") + ''
       substituteInPlace _build/oils.sh \
@@ -442,7 +435,7 @@ in with final; {
     ];
   });
 
-  # 2025/08/26: upstreaming is unblocked; TODO: send `pr-papers-cross` desko branch out for PR!
+  # 2025/08/31: upstreaming is unblocked; out for review: <https://github.com/NixOS/nixpkgs/pull/437704>
   # papers = prev.papers.override {
   #   cargo = crossCargo;
   # };
@@ -690,7 +683,7 @@ in with final; {
   #   ];
   # });
 
-  # 2025/08/26: upstreaming blocked on gvfs -> udisks -> libblockdev -> {thin-provisioning-tools,libndctl -> ... -> ruby}
+  # 2025/08/31: upstreaming blocked on gvfs -> udisks -> libblockdev -> {thin-provisioning-tools,libndctl -> ... -> ruby}
   swaynotificationcenter = mvToNativeInputs [ buildPackages.wayland-scanner ] prev.swaynotificationcenter;
 
   # 2025/07/27: upstreaming is unblocked