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

emscripten: 1.39.1 -> 2.0.1 #96555

Merged
merged 11 commits into from Aug 29, 2020
Merged

emscripten: 1.39.1 -> 2.0.1 #96555

merged 11 commits into from Aug 29, 2020

Conversation

gebner
Copy link
Member

@gebner gebner commented Aug 28, 2020 •
edited

Motivation for this change

New upstream version. Emscripten no longer requires its own fastcomp fork of LLVM. I've successfully compiled a small example.

The emscripten build is broken on master, causing tree-sitter to fail as well. I've also fixed the tree-sitter build here.

TODO: acorn-optimizer doesn't work yet because it requires the acorn node package.

Closes #75849
Closes #95951

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@gebner gebner marked this pull request as ready for review August 28, 2020 19:02
@ofborg ofborg bot requested a review from Profpatsch August 28, 2020 19:43
@gebner
Copy link
Member Author

gebner commented Aug 29, 2020

I've added the required node dependencies for the acorn optimizer. Now emscriptenPackages.zlib builds successfully.

The node dependencies are built in a somewhat idiosyncratic way. Upstream apparently has a package.json file, but this is only used to list the dependencies. It does not even include a name or version. Therefore I'm using the mkYarnModule from yarn2nix to build only the node_modules directory. The generated wrappers then set the NODE_PATH environment variable manually.

@gebner gebner changed the title emscripten: 1.39.1 -> 2.0.0 emscripten: 1.39.1 -> 2.0.1 Aug 29, 2020
@gebner
Copy link
Member Author

gebner commented Aug 29, 2020

Evaluation failure is unrelated.

@gebner gebner merged commit 6141b50 into NixOS:master Aug 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asppsa asppsa Awaiting requested review from asppsa

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@qknight qknight Awaiting requested review from qknight

@Profpatsch Profpatsch Awaiting requested review from Profpatsch

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
1 participant
@gebner