Merge branch 'staging-next' into staging

There was a nontrivial conflict in pkgs/stdenv/linux/bootstrap-tools* (reorganizing code vs. modifying it) I hope I really got it right.
2024-08-05 11:05:55 +02:00
parent 423c64a625 3c285dc41c
commit d4720e9c1e
672 changed files with 14516 additions and 7292 deletions
@@ -1,4 +1,4 @@
-{ callPackage, fetchpatch2, openssl, python3, enableNpm ? true }:
+{ callPackage, openssl, python3, enableNpm ? true }:

 let
  buildNodejs = callPackage ./nodejs.nix {