Bot-based backport to release-26.05, triggered by a label in #561646.
Before merging, ensure that this backport is acceptable for the release.
Even as a non-committer, if you find that it is not acceptable, leave a comment.
[!TIP] If you maintain all packages touched by this pull request, and they are all located under
pkgs/by-name/*, you can comment@NixOS/nixpkgs-merge-bot mergeto automatically merge this PR using thenixpkgs-merge-bot.
- The commit messages follow the nixpkgs format, like
hello: 2.12 -> 2.13ornixos/nginx: fix the test. Guide metais complete:description,homepage,license,maintainers,mainProgram. Guide- Sources are fixed-output and pinned by a hash. No
lib.fakeHashis left. Guide - A command-line tool has
versionCheckHook, or another check that runs it. Guide meta.platformsmatches what upstream supports. Guide- The tests run:
passthru.tests, the NixOS test of a module, or nixpkgs-review. Guide - AI use is disclosed with an
Assisted-by:trailer. Guide
The title does not start with name:. AI use: none disclosed in the last commit or the description.
Files changed 1
Reviews and comments
This report is automatically generated by the PR / Check / cherry-pick CI workflow.
Some of the commits in this PR require the author's and reviewer's attention.
Sometimes it is not possible to cherry-pick exactly the same patch. This most frequently happens when resolving merge conflicts. The range-diff will help to review the resolution of conflicts.
If you need to merge this PR despite the warnings, please dismiss this review shortly before merging.
<blockquote>[!WARNING] Difference between 0ec300a034a4e57a160e968fffeb40594d0d7e66 and original 511307eb8dfba86da4d1a7ddd1847551a9972ab4 may warrant inspection.
<details><summary>Show diff</summary>@@ Metadata
## Commit message ##
nodejs_26: 26.8.1 -> 26.8.2
+ (cherry picked from commit 511307eb8dfba86da4d1a7ddd1847551a9972ab4)
+
## pkgs/development/web/nodejs/v26.nix ##
@@ pkgs/development/web/nodejs/v26.nix: let
[ ];
@@ pkgs/development/web/nodejs/v26.nix: let
patches =
(lib.optional (!(stdenv.hostPlatform.emulatorAvailable buildPackages)) (fetchpatch2 {
url = "https://raw.githubusercontent.com/buildroot/buildroot/2f0c31bffdb59fb224387e35134a6d5e09a81d57/package/nodejs/nodejs-src/0003-include-obj-name-in-shared-intermediate.patch";
-@@ pkgs/development/web/nodejs/v26.nix: buildNodejs {
- ./use-nix-codesign.patch
-
- ./fix-temporal-integration-with-shared-icu.patch
--
-- # TODO: remove when support for OpenSSL 3.6.4 has landed upstream
-- (fetchpatch2 {
-- url = "https://github.com/nodejs/node/commit/28b571c38af5631b95e993258764caa3604c3fca.patch?full_index=1";
-- hash = "sha256-fyQICYO3xwTJQKGWUqEcmsflhDy+uQtEFuC5KlZnsus=";
-- })
- ]
- ++ gypPatches;
- }
</details></blockquote>
Hint: The full diffs are also available in the runner logs with slightly better highlighting.