Skip to content

Backport nodejs from #53270 #53375

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
Merged
merged 8 commits into from
Feb 12, 2019
Merged

Backport nodejs from #53270 #53375

merged 8 commits into from
Feb 12, 2019

Conversation

adisbladis
Copy link
Member

@adisbladis adisbladis commented Jan 4, 2019 •
edited
Loading

Motivation for this change

Backport nodejs changes from #53270.
Had to bump libuv to get nodejs-10-x to build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg requested a review from cstrahan January 4, 2019 03:29
@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jan 4, 2019
@grahamc grahamc mentioned this pull request Jan 4, 2019
Open
@Mic92
Copy link
Member

Mic92 commented Jan 4, 2019

staging-18.09 maybe?

R. RyanTM and others added 7 commits January 10, 2019 11:33
@adisbladis
libuv: 1.21.0 -> 1.23.0
0baa330 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions.

(cherry picked from commit 5a95b0b)
@r-ryantm @adisbladis
libuv: 1.23.0 -> 1.23.1 (NixOS#47763)
1515377 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions

(cherry picked from commit ef93155)
@r-ryantm @adisbladis
libuv: 1.23.1 -> 1.23.2
692c5df 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libuv/versions

(cherry picked from commit 1699401)
@r-ryantm @adisbladis
http-parser: 2.8.1 -> 2.9.0
35a07f6 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/http-parser/versions

(cherry picked from commit 5b9ad12)
@marsam @adisbladis
nodejs-6_x: 6.14.4 -> 6.16.0
9ebc5f6 
(cherry picked from commit 39bec39)
@marsam @adisbladis
nodejs-8_x: 8.11.4 -> 8.15.0
eeb3ca3 
(cherry picked from commit bf84722)
@marsam @adisbladis
nodejs-10_x: 10.12.0 -> 10.15.0
3bd7f31 
(cherry picked from commit 4c917c6)
@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 10, 2019
@adisbladis adisbladis changed the base branch from release-18.09 to staging-18.09 January 10, 2019 20:39
@wmertens
Copy link
Contributor

wmertens commented Feb 7, 2019

LGTM, I fixed the conflicts, any reason this is not merged into staging yet?

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. and removed 2.status: merge conflict This PR has merge conflicts with the target branch labels Feb 7, 2019
@adisbladis adisbladis merged commit 0a3561a into NixOS:staging-18.09 Feb 12, 2019
@adisbladis
Copy link
Member Author

@wmertens No good reason except inertia.

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

@cstrahan cstrahan Awaiting requested review from cstrahan

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@adisbladis @Mic92 @wmertens @GrahamcOfBorg @r-ryantm @marsam