nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-03 21:40:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/staging-next' into staging

Browse Source
This commit is contained in:
Michael Daniels
2026-09-13 14:19:52 -04:00
parent 10a679b628 6312385d3f
commit ae94a54779
1289 changed files with 30843 additions and 19605 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/web/nodejs/update.nix
View File

@@ -13,10 +13,10 @@
}:
let
rev = "890d535527789c9ebccdccdafd708f60dbd56786"; # should be the HEAD of nodejs/release-keys
rev = "481637f813e912c4aa3622d7964ab426c97b8e8d"; # should be the HEAD of nodejs/release-keys
pubring = fetchurl {
url = "https://github.com/nodejs/release-keys/raw/${rev}/gpg-only-active-keys/pubring.kbx";
hash = "sha256-jm+JUhoGlORF9C3s0CL0g2nGNPG1vLWXUTW2nIhimug=";
hash = "sha256-FA8q1SYP1idztiQ86OHTAJZF1VjxIbgmLFXjg9woWTI=";
};
in
writeScript "update-nodejs" ''

10
pkgs/development/web/nodejs/v26.nix
View File

@@ -23,8 +23,8 @@ let
[ ];
in
buildNodejs {
version = "26.8.1";
sha256 = "d1698832a1a10f050cdda044a3e3d6a748246811e2e7bc89ba9a8bd693dc45f2";
version = "26.8.2";
sha256 = "36b37bf5ee4d092b9d9dff2d1a90b1444f8b453eddf6ff96cabdebb97d32f41d";
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";
@@ -49,12 +49,6 @@ 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;
}