From 7ee91765fc8bfd6dd554993233ab99491fa0bf9a Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 17 Mar 2025 01:28:16 +0000
Subject: [PATCH] upstream some cross compilation fixes; remove patches which
 are no longer necessary

---
 overlays/cross.nix                        | 27 -----------------------
 pkgs/by-name/nixpkgs-bootstrap/master.nix |  4 ++--
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/overlays/cross.nix b/overlays/cross.nix
index f703b0f94..e16d9dbeb 100644
--- a/overlays/cross.nix
+++ b/overlays/cross.nix
@@ -330,21 +330,6 @@ in with final; {
     ];
   };
 
-  # 2025/02/08: upstreaming is unblocked
-  flatpak = prev.flatpak.overrideAttrs (upstream: {
-    outputs = lib.remove "devdoc" upstream.outputs;
-    depsBuildBuild = (upstream.depsBuildBuild or []) ++ [
-      pkgsBuildBuild.pkg-config
-    ];
-    nativeBuildInputs = upstream.nativeBuildInputs ++ [
-      gtk-doc
-      pkgsBuildHost.wayland-scanner
-    ];
-    mesonFlags = upstream.mesonFlags ++ [
-      "-Dgtkdoc=disabled"
-    ];
-  });
-
   # 2025/01/13: upstreaming is blocked by glycin-loaders
   fractal = prev.fractal.override {
     cargo = crossCargo;
@@ -891,12 +876,6 @@ in with final; {
     '';
   });
 
-  # 2025/01/19: upstreaming is unblocked
-  tree-sitter = prev.tree-sitter.overrideAttrs (upstream: {
-    # shell completions were enabled, but aren't cross-compatible: <https://github.com/nixos/nixpkgs/pull/368976>
-    postInstall = lib.replaceStrings [ "installShellCompletion" ] [ "true || installShellCompletion" ] upstream.postInstall;
-  });
-
   # fixes: "ar: command not found"
   # `ar` is provided by bintools
   # 2024/05/31: upstreaming is blocked on gnustep-base cross compilation
@@ -962,12 +941,6 @@ in with final; {
   #     upstream.postBuild;
   # });
 
-  wvkbd = prev.wvkbd.overrideAttrs (upstream: {
-    nativeBuildInputs = (upstream.nativeBuildInputs or []) ++ [
-      buildPackages.scdoc
-    ];
-  });
-
   # 2024/11/19: upstreaming is blocked on unar (gnustep), unless i also make that optional
   xarchiver = mvToNativeInputs [ libxslt ] prev.xarchiver;
 
diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index 29325c681..bb420d47b 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/master.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/master.nix
@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "44588aa5476450605bb2cee95b9fd93f20d38697";
-  sha256 = "sha256-ZXEJAKsuFg9NO/X7z3jxUtQ+gdUHihjEo24W0V1RYF0=";
+  rev = "5d9b5431f967007b3952c057fc92af49a4c5f3b2";
+  sha256 = "sha256-nkH2Edu9rClcsQp2PYBe8E6fp8LDPi2uDBQ6wyMdeXI=";
   version = "0-unstable-2025-03-16";
   branch = "master";
 }