Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release-24.05] nodejs recent updates #325550

Merged
merged 16 commits into from
Jul 12, 2024
Merged

[Backport release-24.05] nodejs recent updates #325550

merged 16 commits into from
Jul 12, 2024

Conversation

aduh95
Copy link
Contributor

@aduh95 aduh95 commented Jul 8, 2024

Description of changes

#323119 (comment)

Things done

I cherry-picked commits from https://github.com/NixOS/nixpkgs/commits/staging/pkgs/development/web/nodejs that weren't yet on the 24.05 line.

  • 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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

aduh95 and others added 11 commits July 8, 2024 15:50
@aduh95
nodejs: run JS test suite as part of the checks
d0efd89 
(cherry picked from commit b26563a)
@superherointj @aduh95
nodejs: add bash shell completion
88b1d99 
Fixes NixOS#316507

(cherry picked from commit f8d01a8)
@r-ryantm @aduh95
nodejs-slim_22: 22.2.0 -> 22.3.0
ecf529e 
(cherry picked from commit dd1ea8f)
@aduh95
nodejs_20: 20.12.2 -> 20.14.0 (NixOS#316258)
d8dde74 
(cherry picked from commit 892f509)
@tie @aduh95
nodejs: fix impure configure phase
69a5ce0 
When running configurePhase from impure build environment (i.e. nix
develop), default ./configure script was selecting wrong, impure Python
installation.
https://github.com/nodejs/node/blob/d57af10d1be390f4e33e6efe596133de9da36c86/configure#L7-L15

(cherry picked from commit f2f7ea8)
@tie @aduh95
nodejs_22: fix build with openssl 3.0.14
2529baa 
(cherry picked from commit bb3a488)
@tie @aduh95
nodejs_22: fix missing /bin/bash in tests
e53072d 
(cherry picked from commit 1404cb5)
@aduh95
nodejs_22: 22.3.0 -> 22.4.0 (NixOS#323982)
05c5ffb 
(cherry picked from commit 87327df)
@tie @aduh95
nodejs: remove unused bypass-xcodebuild.diff
e0ae765 
(cherry picked from commit 5bf99d0)
@tie @aduh95
nodejs: fix sandboxed build on darwin
45a9c41 
(cherry picked from commit ce685a8)
@tie @aduh95
nodejs: add testVersion to passthru.tests
b0b8bd7 
(cherry picked from commit 97240ea)
@ofborg ofborg bot requested review from cillianderoiste and cko July 8, 2024 15:14
@vcunat vcunat mentioned this pull request Jul 10, 2024
Closed
1 task
@vcunat
Copy link
Member

vcunat commented Jul 10, 2024

nodejs: run JS test suite as part of the checks

Well, this one turned out problematic, as seen in PR #325844

Perhaps this backporting was choosing too much overall?

emilazy and others added 4 commits July 11, 2024 16:04
@emilazy @aduh95
nodejs: disable JS test suite on Darwin
1a9ad9b 
This was recently enabled in NixOS#313982. It seems to be much too flaky
on Darwin currently, especially x86; see:

* <https://hydra.nixos.org/build/264860513/nixlog/8>
* <https://hydra.nixos.org/build/264956149/nixlog/3>
* <https://hydra.nixos.org/build/265094929/nixlog/3>
* <https://hydra.nixos.org/build/264901296/nixlog/3>

Disable these tests on macOS for now as the broken Node.js package
is holding up a lot of builds.

Fixes: b26563a
(cherry picked from commit d25d9b6)
@aduh95
nodejs_18: 18.20.3 -> 18.20.4
41423cf 
(cherry picked from commit 2f17657)
@aduh95
nodejs_20: 20.15.0 -> 20.15.1 (NixOS#325616)
e1bda3b 
(cherry picked from commit 149c046)
@aduh95
nodejs_22: 22.4.0 -> 22.4.1
d010e61 
(cherry picked from commit e11b071)
@aduh95
Copy link
Contributor Author

aduh95 commented Jul 11, 2024

@vcunat do you think I should try to drop that commit, and fix the resulting git conflicts that would arise?

@vcunat vcunat changed the base branch from staging-24.05 to staging-next-24.05 July 12, 2024 07:49
@vcunat vcunat self-assigned this Jul 12, 2024
@vcunat vcunat merged commit d010e61 into NixOS:staging-next-24.05 Jul 12, 2024
23 of 27 checks passed
vcunat added a commit that referenced this pull request Jul 12, 2024
@vcunat
Merge #325550: nodejs recent updates
27c78b8 
...into staging-next-24.05
@vcunat
Copy link
Member

vcunat commented Jul 12, 2024

After discussion with @emilazy, merged with that test disabled by 21e3782

@aduh95 aduh95 deleted the backport-nodejs-changes branch July 12, 2024 11:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cillianderoiste cillianderoiste Awaiting requested review from cillianderoiste

@cko cko Awaiting requested review from cko

Assignees

@vcunat vcunat

Labels
6.topic: nodejs 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@aduh95 @vcunat @superherointj @r-ryantm @tie @emilazy