nixpkgs: 2025-05-02 -> 2025-05-03

overlays/cross.nix

@@ -123,54 +123,6 @@ let
     inherit (cargo) meta;
   };
 in with final; {
-  # bamf: required via pantheon.switchboard -> wingpanel -> gala
-  # 2025/05/01: upstreaming is unblocked, out for PR: <https://github.com/NixOS/nixpkgs/pull/403541>
-  # bamf = prev.bamf.overrideAttrs (upstream: {
-  #   # "You must have gtk-doc >= 1.0 installed to build documentation"
-  #   depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
-  #     pkg-config  #< to find gtk-doc
-  #     (buildPackages.python3.withPackages (ps: with ps; [ lxml ])) # Tests
-  #   ];
-  #   # nativeBuildInputs = [
-  #   #   # (python3.withPackages (ps: with ps; [ lxml ])) # Tests
-  #   #   autoreconfHook
-  #   #   dbus
-  #   #   docbook_xsl
-  #   #   gnome.gnome-common
-  #   #   gobject-introspection
-  #   #   gtk-doc
-  #   #   pkg-config
-  #   #   vala
-  #   #   which
-  #   #   wrapGAppsHook3
-  #   #   xorg.xorgserver
-  #   # ] ++ [
-  #   # nativeBuildInputs = lib.tail upstream.nativeBuildInputs ++ [
-  #   nativeBuildInputs = (
-  #     lib.filter (p:
-  #       !lib.hasPrefix python3.pname (p.name or p.pname or "") &&
-  #       # ... i can't figure out where it's getting libX11 from :|
-  #       (p.pname or "") != xorg.xorgserver.pname &&
-  #       (p.pname or "") != gnome.gnome-common.pname
-  #     )
-  #     upstream.nativeBuildInputs
-  #   ) ++ [
-  #     buildPackages.gettext  #< for msgfmt
-  #   ];
-
-  #   buildInputs = upstream.buildInputs ++ [
-  #     xorg.xorgserver  #< upstream incorrectly places this in `nativeBuildInputs`
-  #   ];
-
-  #   # nativeBuildInputs = upstream.nativeBuildInputs ++ [
-  #   #   (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ lxml ])) # Tests
-  #   # ];
-  #   configureFlags = [
-  #     "--enable-gtk-doc"
-  #     # "--enable-headless-tests"  #< can't test when cross compiling
-  #   ];
-  # });
-
   # binutils = prev.binutils.override {
   #   # fix that resulting binary files would specify build #!sh as their interpreter.
   #   # dtrx is the primary beneficiary of this.
@@ -313,7 +265,7 @@ in with final; {
   #   ];
   # });
 
-  # 2025/05/01: blocked on psqlodbc
+  # 2025/05/02: blocked on psqlodbc (available after next staging merge)
   # used by hyprland (which is an indirect dep of waybar, nwg-panel, etc),
   # which it shells out to at runtime (and hence, not ever used by me).
   hyprland-qtutils = null;