nixpkgs: 2025-04-11 -> 2025-04-12

pkgs/by-name/nixpkgs-bootstrap/2024-10-01-python-cross-resource-usage.patch

@@ -1,26 +0,0 @@
-commit bd996f1383845e255fb7efddd044996fcf45d578 (HEAD -> 2024-09-30-python-cross-fix)
-Author: Colin <colin@uninsane.org>
-Date:   2024-10-01 09:44:35 +0000
-
-    NOT FOR MERGE: reduce resource usage for cross-compiled python
-
-    this breaks `python.override { ... }`
-
-    for context, see: <https://github.com/NixOS/nixpkgs/issues/338231>
-
-diff --git pkgs/development/interpreters/python/cpython/default.nix pkgs/development/interpreters/python/cpython/default.nix
-index 977dd577fc90..c8e83b2f7887 100644
---- pkgs/development/interpreters/python/cpython/default.nix
-+++ pkgs/development/interpreters/python/cpython/default.nix
-@@ -147,10 +147,7 @@ let
-       inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs;
-       override =
-         attr:
--        let
--          python = attr.override (inputs' // { self = python; });
--        in
--        python;
-+        attr;
-     in
-     passthruFun rec {
-       inherit self sourceVersion packageOverrides;

pkgs/by-name/nixpkgs-bootstrap/master.nix

@@ -8,8 +8,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "92e3509b009995177db1ac32b01fc53202db8201";
+  rev = "6b433a6e2165e485cc928d04f0f748d34d3f9cf6";
-  sha256 = "sha256-7BElBJFcfpFJxXVVgbRw/V78UySnId1uiW73P8fFT8M=";
+  sha256 = "sha256-YAq1N9C0A9kx93+P5ctkawrGRKrGQKZ+pQkJpMpvXF0=";
-  version = "0-unstable-2025-04-11";
+  version = "0-unstable-2025-04-12";
   branch = "master";
 }

pkgs/by-name/nixpkgs-bootstrap/patches.nix

@@ -29,23 +29,6 @@ let
     );
 in
 [
-  # ./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.
-    # TODO: check if CapabilityBoundingSet takes effect or is union'd with upstream's
-    # TODO: test basic functionality
-    name = "nixos/bluetooth: add systemd hardening";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/377927";
-    hash = "sha256-D8Royett8CSZD7xHYEj6qvJCMFaFKz8SNOIBABapgDc=";
-  })
-
   (fetchpatch' {
     # 2024-12-26: required to build ollama (with AMD acceleration)
     # 2025-03-14: merged into staging
@@ -60,22 +43,6 @@ in
     hash = "sha256-9GjvmZoDmU2vIR4g5ADAGRixe13/js44dzVfh2IIDBw=";
   })
 
-  (fetchpatch' {
-    # dep of swaync, evolution-data-server, folks, calls, gnome-calendar, gnome-contacts, planify
-    name = "libbytesize: fix cross compilation";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/396061";
-    hash = "sha256-40haYcYLjHhIxBl3OXXUxpcilnOL04sSdhHwTO8S+ss=";
-    # saneCommit = "6122f10876e3642092e8b8e1160f164ca87bda7d";
-    # hash = "sha256-wg2iIm36q65rwfTan6ZDBRVoVpG01dIsAu6/loOCxlo=";
-  })
-
-  (fetchpatch' {
-    # TODO: update PR with "Tested basic functionality of all binary files" box after deploy
-    name = "nano: fix cross compilation, enable strictDeps";
-    prUrl = "https://github.com/NixOS/nixpkgs/pull/396996";
-    hash = "sha256-MeSKoU+y4E/BJlotgMZWN39BoppVMjCM5eQFpokOKDo=";
-  })
-
   # (fetchpatch' {
   #   # XXX(2025-01-06): patch does not produce valid binaries for cross
   #   name = "lua-language-server: fix cross compiling";

pkgs/by-name/nixpkgs-bootstrap/staging-next.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "f6b06476fcf2aef096bea6d3790a71db67246996";
+  rev = "568e9905054fa5fa160e98ea0bf8b4c27a5a3dae";
-  sha256 = "sha256-HWTPSZFsZ4g7SdDu6vcLX40Rxg2NKBv7lT0PtDgBU14=";
+  sha256 = "sha256-Em8x9Nv6nA0pE85u5sQEtjJa81VPIT/BjNESjeHS0Us=";
-  version = "0-unstable-2025-04-11";
+  version = "0-unstable-2025-04-12";
   branch = "staging-next";
 }

pkgs/by-name/nixpkgs-bootstrap/staging.nix

@@ -2,8 +2,8 @@
   mkNixpkgs ? import ./mkNixpkgs.nix {},
 }:
 mkNixpkgs {
-  rev = "17dcde7be7ea631df70944a7a5df1be38c7ad4fb";
+  rev = "3bf50e95e8f49e3b0d1445e4818fc78c51f29160";
-  sha256 = "sha256-H/f+vIiabyU9VabtHX6FCuX9UunW2KaXyrSNmjuDNXw=";
+  sha256 = "sha256-BZP83VFkaUz368f7h+rDIjDscq1KsJMIpdG061ZbvEU=";
-  version = "0-unstable-2025-04-11";
+  version = "0-unstable-2025-04-12";
   branch = "staging";
 }

pkgs/by-name/signal-desktop-from-src/package.nix

@@ -89,7 +89,7 @@
   atk,
   autoPatchelfHook,
   cups,
-  electron_33-bin,
+  electron_35-bin,
   fetchFromGitHub,
   fetchurl,
   flac,
@@ -173,7 +173,7 @@ let
   # prefer to use the same electron version as everywhere else, and a `-bin` version to avoid 4hr rebuilds.
   # the non-bin varieties *seem* to ship the wrong `electron.headers` property.
   # - maybe they can work if i manually DL and ship the corresponding headers
-  electron' = electron_33-bin;
+  electron' = electron_35-bin;
 
   buildNpmArch = if stdenv.buildPlatform.isAarch64 then "arm64" else "x64";
   hostNpmArch = if stdenv.hostPlatform.isAarch64 then "arm64" else "x64";
@@ -303,8 +303,7 @@ stdenv.mkDerivation (finalAttrs: {
     # need to build against electron's versions of the node headers, or something.
     # without patching this, Signal can build, but will fail with `undefined symbol: ...` errors at runtime.
     # see: <https://www.electronjs.org/docs/latest/tutorial/using-native-node-modules>
-    tar xzf ${electron'.headers}
+    export npm_config_nodedir=${electron'.headers}
-    export npm_config_nodedir=$(pwd)/node_headers
 
     # patchShebangs --build --update node_modules/{bufferutil/node_modules/node-gyp-build/,node-gyp-build,utf-8-validate/node_modules/node-gyp-build}
     # patch these out to remove a runtime reference back to the build bash