From bca2cea95fbe6b61a6469b32e26bfe30cfb522e7 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 4 Apr 2025 15:12:14 +0000
Subject: [PATCH] nixpkgs: 2025-04-03 -> 2025-04-04

---
 pkgs/by-name/nixpkgs-bootstrap/master.nix       |  6 +++---
 pkgs/by-name/nixpkgs-bootstrap/patches.nix      | 16 +++++++++++++++-
 pkgs/by-name/nixpkgs-bootstrap/staging-next.nix |  6 +++---
 pkgs/by-name/nixpkgs-bootstrap/staging.nix      |  6 +++---
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/nixpkgs-bootstrap/master.nix b/pkgs/by-name/nixpkgs-bootstrap/master.nix
index 2160d29ba..49c5aa7e1 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 = "f90d0a338d95120763afc3ba43410ba3391ad77b";
-  sha256 = "sha256-fCsKB91aNDC7I5LgM5KGxlfJdhEbta5WrYxQmnPL1X4=";
-  version = "0-unstable-2025-04-03";
+  rev = "1f2699e6b328302a2ce91f373e99b838b303752a";
+  sha256 = "sha256-2dRatLLAdktPrIFCvWrZdhki0gQZ00aHi3ZA+4JqGpg=";
+  version = "0-unstable-2025-04-04";
   branch = "master";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/patches.nix b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
index e4a22f54f..db30ca4f9 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/patches.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/patches.nix
@@ -29,7 +29,13 @@ let
     );
 in
 [
-  ./2024-10-01-python-cross-resource-usage.patch
+  # ./2024-10-01-python-cross-resource-usage.patch
+
+  (fetchpatch' {
+    name = "python3: Fixing excessive memory usage for overriden python in cross-compile";
+    prUrl = "https://github.com/NixOS/nixpkgs/pull/394541";
+    hash = "sha256-WiZjVWoymgCS7bS5a2J77Fmkvq5nf1qCBe3A7zMl0GU=";
+  })
 
   (fetchpatch' {
     # 2025-03-07: i'm testing this patch before merge.
@@ -54,6 +60,14 @@ in
     hash = "sha256-9GjvmZoDmU2vIR4g5ADAGRixe13/js44dzVfh2IIDBw=";
   })
 
+  (fetchpatch' {
+    # XXX(2025-04-03): send out for review once tested!
+    # dep of swaync, evolution-data-server, folks, calls, gnome-calendar, gnome-contacts, planify
+    name = "libbytesize: fix cross compilation";
+    saneCommit = "6122f10876e3642092e8b8e1160f164ca87bda7d";
+    hash = "sha256-wg2iIm36q65rwfTan6ZDBRVoVpG01dIsAu6/loOCxlo=";
+  })
+
   # (fetchpatch' {
   #   # XXX(2025-01-06): patch does not produce valid binaries for cross
   #   name = "lua-language-server: fix cross compiling";
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
index 4315b93c1..98ba7c140 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging-next.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "7b881933073a68a6b76917b1b64c1b538547903d";
-  sha256 = "sha256-iz1V93JWiX0t2xbJno0hhj3NawLJC4RP2c3Xx5zQ5QY=";
-  version = "0-unstable-2025-04-03";
+  rev = "276f9ec97644393e64486c2464716ee80ba39740";
+  sha256 = "sha256-ziea2r30f+UD0Ly3oeLePIWyK6oV2icPYq2jgCf/wDg=";
+  version = "0-unstable-2025-04-04";
   branch = "staging-next";
 }
diff --git a/pkgs/by-name/nixpkgs-bootstrap/staging.nix b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
index 2bef3acdb..cfed41bab 100644
--- a/pkgs/by-name/nixpkgs-bootstrap/staging.nix
+++ b/pkgs/by-name/nixpkgs-bootstrap/staging.nix
@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "0fba85408e8856e3dc165dde47f97435c4e1b339";
-  sha256 = "sha256-JA7aZxXO0UO5qfL9h1mvKAi+WGD6nV/PPTdMP9UnL+w=";
-  version = "0-unstable-2025-04-02";
+  rev = "3874d83b1936ff35aae17468046eb299cc6a9662";
+  sha256 = "sha256-ziea2r30f+UD0Ly3oeLePIWyK6oV2icPYq2jgCf/wDg=";
+  version = "0-unstable-2025-04-04";
   branch = "staging";
 }