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.

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

emscripten: use matching binaryen version #37427

Merged
merged 1 commit into from Mar 20, 2018

Conversation

asppsa
Copy link
Contributor

@asppsa asppsa commented Mar 20, 2018

This changes the emscripten package so that it specifies the rev from
the binaryen repo to use, and sets it to always use the version that has
been tagged for use with that version of emscripten. This should force
future updates of emscripten to also update binaryen.

Binaryen can also be installed as a stand-alone package, so there's some
logic added to the binaryen package to allow building in both ways, and
distinguishing between them.

Motivation for this change

The reason for this change is that the emscripten-binaryen relationship seems quite brittle -- using the wrong version of binaryen seems to make emscripten unreliable.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@Mic92
Copy link
Member

Mic92 commented Mar 20, 2018

@GrahamcOfBorg build emscriptenPackages.binaryen

@GrahamcOfBorg
Copy link

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: emscriptenPackages.binaryen

Partial log (click to expand)

Cannot nix-instantiate `emscriptenPackages.binaryen' because:
error: attribute 'binaryen' in selection path 'emscriptenPackages.binaryen' not found

@GrahamcOfBorg
Copy link

No attempt on aarch64-linux

The following builds were skipped because they don't evaluate on aarch64-linux: emscriptenPackages.binaryen

No partial log is available.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin

The following builds were skipped because they don't evaluate on x86_64-darwin: emscriptenPackages.binaryen

No partial log is available.

This changes the emscripten package so that it specifies the rev from
the binaryen repo to use, and sets it to always use the version that has
been tagged for use with that version of emscripten.  This should force
future updates of emscripten to also update binaryen.

Binaryen can also be installed as a stand-alone package, so there's some
logic added to the binaryen package to allow building in both ways, and
distinguishing between them.
@asppsa asppsa force-pushed the binaryen-emscripten-version2 branch from eeb5fb2 to adb8020 Compare March 20, 2018 10:06
@asppsa asppsa changed the title emscripten/binaryen: make binaryen track the current emscripten version emscripten: use matching binaryen version Mar 20, 2018
@asppsa
Copy link
Contributor Author

asppsa commented Mar 20, 2018

Sorry @GrahamcOfBorg, I formatted the commit incorrectly :(

@asppsa
Copy link
Contributor Author

asppsa commented Mar 20, 2018

@GrahamcOfBorg build emscripten binaryen

@dtzWill
Copy link
Member

dtzWill commented Mar 20, 2018

cc @qknight

@qknight qknight merged commit 497e50c into NixOS:master Mar 20, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants