Skip to content

[backport staging-24.11] libuv and Node.js changes#368368

Closed
aduh95 wants to merge 6 commits intoNixOS:staging-24.11from
aduh95:nodejs-backports-24.11
Closed

[backport staging-24.11] libuv and Node.js changes#368368
aduh95 wants to merge 6 commits intoNixOS:staging-24.11from
aduh95:nodejs-backports-24.11

Conversation

@aduh95
Copy link
Contributor

@aduh95 aduh95 commented Dec 26, 2024

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.

@github-actions github-actions bot added the 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment label Dec 26, 2024
@aduh95 aduh95 force-pushed the nodejs-backports-24.11 branch from 6ad9a55 to f656220 Compare December 26, 2024 16:30
@aduh95 aduh95 changed the title [24.11 backports] Node.js changes [backport staging-24.11] libuv and Node.js changes Dec 26, 2024
@aduh95 aduh95 mentioned this pull request Dec 26, 2024
Closed
13 tasks
@ofborg ofborg bot added the 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. label Dec 26, 2024
@ofborg ofborg bot requested a review from np December 26, 2024 21:44
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Dec 26, 2024
paparodeo
paparodeo suggested changes Dec 26, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change f91efefb30ff3f324200c3c6b018135b2c6ead67 should be dropped as it will break x64 darwin on 24.11 (x64 darwin sdk was bumped to 11 on master but remains at 10.12 on 24.11)

[edit] the change has been dropped from this PR so all good here.

@mweinelt mweinelt marked this pull request as draft December 31, 2024 14:26
@aduh95 aduh95 mentioned this pull request Jan 5, 2025
Merged
13 tasks
@aduh95 aduh95 force-pushed the nodejs-backports-24.11 branch from f656220 to c029740 Compare January 6, 2025 15:55
@aduh95 aduh95 marked this pull request as ready for review January 7, 2025 08:40
r-ryantm and others added 6 commits January 7, 2025 10:15
@r-ryantm @aduh95
libuv: 1.48.0 -> 1.49.2
3d029ba 
(cherry picked from commit a1c1180)
@aduh95
Revert "nodejs_22: fix build with libuv 1.48.0"
f155109 
This reverts commit f1f3028.
@wegank @aduh95
nodejs_23: drop reverts
f15d40f 
(cherry picked from commit 982e3fc)
@paparodeo @aduh95
libuv: disable flaky darwin test
9c676be 
test fails on darwin sometimes

(cherry picked from commit c247ef1)
@paparodeo @aduh95
libuv: remove redundant conditionally disabled tests
5e20820 
remove conditionally disabled tests if they are already disabled by
default.

(cherry picked from commit 69dd998)
@aduh95
nodejs_22: use shared SQLite
8682207 
(cherry picked from commit 5ec3e7b)
@aduh95 aduh95 force-pushed the nodejs-backports-24.11 branch from c029740 to 8682207 Compare January 7, 2025 09:15
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Feb 15, 2025
@aduh95
Copy link
Contributor Author

aduh95 commented Mar 27, 2025

Not worth it, 25.05 is just around the corner

@aduh95 aduh95 closed this Mar 27, 2025
@aduh95 aduh95 deleted the nodejs-backports-24.11 branch March 27, 2025 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@np np Awaiting requested review from np

1 more reviewer

@paparodeo paparodeo paparodeo requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 6.topic: nodejs Node.js is a free, open-source, cross-platform JavaScript runtime environment 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild on Darwin and must target a staging branch. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally 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.

4 participants

@aduh95 @paparodeo @wegank @r-ryantm