Skip to content

[staging-next-24.11] Node.js backports#371149

Merged
emilazy merged 10 commits intoNixOS:staging-next-24.11from
emilazy:push-sumqsuvtzolx
Jan 5, 2025
Merged

[staging-next-24.11] Node.js backports#371149
emilazy merged 10 commits intoNixOS:staging-next-24.11from
emilazy:push-sumqsuvtzolx

Conversation

@emilazy
Copy link
Member

@emilazy emilazy commented Jan 5, 2025

This brings the staging-next-24.11 Node.js derivation up to date with staging, apart from:

I’m hoping this will fix #369690 (comment), but I still need to build it. It will be a fair few rebuilds to eat, of course; the alternative would be guessing at which parts of these make the difference and conditionalizing them on x86_64-darwin. Not sure that’s worth it.

I’m also not really sure what the cause of all this is; the only real changes to the Node derivation from release-24.11 to staging-next-24.11 are Python and libxml2 bumps, but the Python bump is on master as well. My hope is that it’s LLVM or something. My fear is that maybe we’re exposing some libuv issue that the bump on master hid. I dunno.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

symphorien and others added 10 commits January 5, 2025 14:47
@symphorien @emilazy
nodejs: fix build on 32 bit platforms
7cc9725 
this test is failing on both armv7 and i686 and is related to year 2038
issue so it probably affects all 32 bit platforms

(cherry picked from commit 815ec0c)
@aduh95 @emilazy
nodejs_22: 22.10.0 -> 22.11.0
564103c 
(cherry picked from commit 1e99bca)
@reckenrode @emilazy
nodejs_{18,20}: fix build with clang 18 on Darwin
9056aaa 
(cherry picked from commit 94d2817)
@emilazy
nodejs_{18,20}: apply V8 patches for LLVM 19
81987d9 
(cherry picked from commit 5cb1de1)
@emilazy
Revert "nodejs_18: fix build with clang 16 mk2"
858190e 
libc++ 19 no longer supports Clang < 17.

This reverts commit b034e4c.

(cherry picked from commit 42ef358)
@FliegendeWurst @emilazy
nodejs_{20,22,23}: fix flaky test
0dbdc3b 
(cherry picked from commit f634fa2)
@FliegendeWurst @emilazy
nodejs_{20,22}: fix test-os failure
7d52295 
Same as NixOS#356257

(cherry picked from commit cb05815)
@FliegendeWurst @emilazy
nodejs_18: fix test-os failure
20b148a 
(cherry picked from commit bc35348)
@aduh95 @emilazy
nodejs_22: 22.11.0 -> 22.12.0 (NixOS#361565)
598874d 
(cherry picked from commit e4f4440)
@aduh95 @emilazy
nodejs_23: 23.2.0 -> 23.5.0 (NixOS#357699)
0f893f1 
(cherry picked from commit 2b8df76)
@emilazy emilazy requested review from aduh95 and vcunat January 5, 2025 15:21
@github-actions github-actions bot added 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jan 5, 2025
@emilazy emilazy mentioned this pull request Jan 5, 2025
Merged
13 tasks
@emilazy emilazy merged commit ea2f362 into NixOS:staging-next-24.11 Jan 5, 2025
21 of 25 checks passed
@emilazy emilazy deleted the push-sumqsuvtzolx branch January 5, 2025 16:34
@aduh95
Copy link
Contributor

aduh95 commented Jan 5, 2025

LGTM, although I suppose nodejs_22 will need the same libuv-related reverts as Node.js 23.x

@emilazy
Copy link
Member Author

emilazy commented Jan 5, 2025 •
edited
Loading

Ah, I foolishly only tested v20 to speed the process of unblocking staging-next-24.11 up. Will check the other versions too and patch as appropriate.

(We could potentially just upgrade libuv next cycle on 24.11, I don’t know if it’s breaking or not?)

@aduh95 aduh95 mentioned this pull request Jan 5, 2025
Merged
13 tasks
@aduh95
Copy link
Contributor

aduh95 commented Jan 5, 2025

If that helps, I've opened #371201

(We could potentially just upgrade libuv next cycle on 24.11, I don’t know if it’s breaking or not?)

I didn't follow that closely but I don't think it created any breakage when it was updated on master/staging, so I'd expect it to not be too breaking – I tried to do that in #368368 but didn't find the time to investigate the ofborg failures

@emilazy
Copy link
Member Author

emilazy commented Jan 5, 2025

Those just look like regular ofborg transient failures and timeouts rather than anything too concerning. Sorry for missing that PR; it should be fine to throw the SQLite changes and libuv bump in the next staging-24.11, if you wanted to rebase it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vcunat vcunat Awaiting requested review from vcunat

@aduh95 aduh95 Awaiting requested review from aduh95

Assignees

No one assigned

Labels

6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 10.rebuild-darwin: 1001-2500 This PR causes many rebuilds on Darwin and should most likely target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@emilazy @aduh95 @symphorien @reckenrode @FliegendeWurst