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

binaryen: 109 -> 111 #209122

Merged
merged 2 commits into from Jan 22, 2023
Merged

binaryen: 109 -> 111 #209122

merged 2 commits into from Jan 22, 2023

Conversation

willcohen
Copy link
Contributor

@willcohen willcohen commented Jan 5, 2023

Description of changes

In an attempt to backport WebAssembly/binaryen#5378 and WebAssembly/binaryen#5391, upstream has diverged enough from what's in nixpkgs that a lot of manual merge conflict resolutions would be necessary, which requires rebuilding a lot of the wasm2js test case outputs. This might grow to be frustrating as time goes on.

As noted by #206005, emscripten is blocked by #194634, but this PR bumps binaryen forward from 109 to 111 (plus upstream backports) separately.

@RaitoBezarius

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.05 Release Notes (or backporting 22.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@willcohen willcohen marked this pull request as draft January 5, 2023 01:25
@willcohen willcohen changed the title binaryen: backport from upstream binaryen: 109 -> 111 Jan 5, 2023
@ofborg ofborg bot requested a review from asppsa January 5, 2023 02:39
@willcohen
Copy link
Contributor Author

This PR will not work unless additional work is done to backport the binaryen bumps to emscripten. @RaitoBezarius I'll try that out a little and see if it can either go here or possibly sneak in to #206005 (unless that's getting merged in the near future!)

@ofborg ofborg bot requested review from matthewbauer and qknight January 5, 2023 03:36
@willcohen
Copy link
Contributor Author

Result of nixpkgs-review pr 209122 run on aarch64-darwin 1

6 packages marked as broken and skipped:
  • faust2alqt
  • faust2alsa
  • faust2jack
  • faust2jaqt
  • faust2lv2
  • open-music-kontrollers.mephisto
1 package failed to build:
  • tinygo
7 packages built:
  • binaryen
  • emscripten
  • faust (faust2)
  • faust2csound
  • faust2firefox
  • faust2jackrust
  • faust2ladspa

@willcohen
Copy link
Contributor Author

Result of nixpkgs-review pr 209122 run on x86_64-linux 1

2 packages failed to build:
  • faustStk
  • magnetophonDSP.ConstantDetuneChorus
29 packages built:
  • binaryen
  • emscripten
  • faust (faust2)
  • faust2alqt
  • faust2alsa
  • faust2csound
  • faust2firefox
  • faust2jack
  • faust2jackrust
  • faust2jaqt
  • faust2ladspa
  • faust2lv2
  • faustPhysicalModeling
  • faustlive
  • guitarix
  • kapitonov-plugins-pack
  • magnetophonDSP.CharacterCompressor
  • magnetophonDSP.CompBus
  • magnetophonDSP.LazyLimiter
  • magnetophonDSP.MBdistortion
  • magnetophonDSP.RhythmDelay
  • magnetophonDSP.VoiceOfFaust
  • magnetophonDSP.faustCompressors
  • magnetophonDSP.pluginUtils
  • magnetophonDSP.shelfMultiBand
  • mooSpace
  • open-music-kontrollers.mephisto
  • tambura
  • tinygo

@willcohen willcohen marked this pull request as ready for review January 5, 2023 17:51
@willcohen
Copy link
Contributor Author

@RaitoBezarius looks like even old emscripten works with the updated binaryen, so this shouldn't conflict with the emscripten PR!

@RaitoBezarius
Copy link
Member

Do we still want to proceed with this one @willcohen ? (some merge conflicts)

@willcohen
Copy link
Contributor Author

Yes — will rebase in the next day or two!

@willcohen
Copy link
Contributor Author

@RaitoBezarius should be ready to go!

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/1728

@RaitoBezarius
Copy link
Member

@RaitoBezarius should be ready to go!

Reviewing on my side on x86_64-linux and aarch64-linux, if good, I will merge it.

@RaitoBezarius
Copy link
Member

Result of nixpkgs-review pr 209122 run on x86_64-linux 1

2 packages failed to build:
  • faustStk
  • magnetophonDSP.ConstantDetuneChorus
29 packages built:
  • binaryen
  • emscripten
  • faust (faust2)
  • faust2alqt
  • faust2alsa
  • faust2csound
  • faust2firefox
  • faust2jack
  • faust2jackrust
  • faust2jaqt
  • faust2ladspa
  • faust2lv2
  • faustPhysicalModeling
  • faustlive
  • guitarix
  • kapitonov-plugins-pack
  • magnetophonDSP.CharacterCompressor
  • magnetophonDSP.CompBus
  • magnetophonDSP.LazyLimiter
  • magnetophonDSP.MBdistortion
  • magnetophonDSP.RhythmDelay
  • magnetophonDSP.VoiceOfFaust
  • magnetophonDSP.faustCompressors
  • magnetophonDSP.pluginUtils
  • magnetophonDSP.shelfMultiBand
  • mooSpace
  • open-music-kontrollers.mephisto
  • tambura
  • tinygo

@RaitoBezarius
Copy link
Member

Result of nixpkgs-review pr 209122 run on aarch64-linux 1

1 package marked as broken and skipped:
  • faustStk
17 packages built:
  • binaryen
  • emscripten
  • faust (faust2)
  • faust2alqt
  • faust2alsa
  • faust2csound
  • faust2firefox
  • faust2jack
  • faust2jackrust
  • faust2jaqt
  • faust2ladspa
  • faust2lv2
  • faustPhysicalModeling
  • guitarix
  • kapitonov-plugins-pack
  • open-music-kontrollers.mephisto
  • tinygo

@RaitoBezarius RaitoBezarius merged commit 319b8a2 into NixOS:master Jan 22, 2023
@willcohen
Copy link
Contributor Author

Thank you!

@willcohen willcohen deleted the binaryen branch January 22, 2023 22:42
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

3 participants