Skip to content

Comments

emscripten: 3.1.24 -> 3.1.41, llvmPackages_16: 16.0.1 -> 16.0.6, binaryen: 112 -> 113#235624

Merged
RaitoBezarius merged 3 commits intoNixOS:stagingfrom
willcohen:emscripten-wasm2c
Jun 22, 2023
Merged

emscripten: 3.1.24 -> 3.1.41, llvmPackages_16: 16.0.1 -> 16.0.6, binaryen: 112 -> 113#235624
RaitoBezarius merged 3 commits intoNixOS:stagingfrom
willcohen:emscripten-wasm2c

Conversation

@willcohen
Copy link
Contributor

@willcohen willcohen commented Jun 2, 2023 •
edited
Loading

Description of changes

Emscripten 3.1.39 was able to build from earlier versions, but since emscripten 3.1.39 itself dropped wasm2c support, this should be removed from the derivation.

This plus #235219 should unblock future point releases as well.

Edit: Also includes reverted changes from #229718 and #235219 since my llvm point update was broken and the hashes appeared to have changed upstream as well.

Things done

Removed wasm2c from derivation.

  • 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.11 Release Notes (or backporting 23.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.

@willcohen willcohen marked this pull request as ready for review June 2, 2023 16:31
@willcohen willcohen mentioned this pull request Jun 2, 2023
Merged
1 task
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jun 2, 2023
@vcunat
Copy link
Member

vcunat commented Jun 3, 2023

I consider this blocked on emscripten.src
#229718 (comment)

@vcunat vcunat marked this pull request as draft June 3, 2023 13:28
@willcohen willcohen force-pushed the emscripten-wasm2c branch from e694d7c to 2b2c344 Compare June 3, 2023 13:36
@willcohen
Copy link
Contributor Author

willcohen commented Jun 3, 2023

Apologies, updated hash as noted by #229718!

@willcohen willcohen changed the title emscripten: remove wasm2c to fix build emscripten: remove wasm2c to fix build and fix hash Jun 3, 2023
@willcohen willcohen marked this pull request as ready for review June 3, 2023 13:38
@willcohen willcohen mentioned this pull request Jun 3, 2023
Merged
12 tasks
@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

@ofborg build emscripten

@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

@ofborg build
I don't know what's happening, but I'm getting another hash error locally

error: hash mismatch in fixed-output derivation '/nix/store/7i99sg5pzmp5kkfbpj85vjrl7n5wziaj-emscripten-node-modules-3.1.39-npm-deps.drv':
         specified: sha256-NSpVXssXwx+94E1qhM3tt2fN2G0EuvPZSN+Xep2IRs8=
            got:    sha256-QlKm6UvPUa7+VJ9ZvXdxYZzK+U96Ju/oAHPhZ/hyv/I=

@vcunat
Copy link
Member

vcunat commented Jun 5, 2023

I reverted emscripten+binaryen updates for now. That way they fetch and build for me.

@vcunat vcunat marked this pull request as draft June 5, 2023 12:02
@willcohen willcohen force-pushed the emscripten-wasm2c branch from 2b2c344 to c9d51a1 Compare June 5, 2023 14:44
@willcohen willcohen changed the base branch from staging-next to master June 5, 2023 14:44
@willcohen willcohen changed the title emscripten: remove wasm2c to fix build and fix hash emscripten: 3.1.24 -> 3.1.39, llvmPackages_16: 16.0.1 -> 16.0.5, binaryen: 112 -> 113 Jun 5, 2023
@willcohen
Copy link
Contributor Author

willcohen commented Jun 5, 2023

Trying again with the reverted changes from #229718 and #235219 redone here and llvm gnu-install-dirs patch updated. Will run with full nixpkgs-review before undrafting.

@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. and removed 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. labels Jun 5, 2023
@willcohen
Copy link
Contributor Author

willcohen commented Jun 5, 2023

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

12 packages marked as broken and skipped:
  • fast-cli
  • faust2alqt
  • faust2alsa
  • faust2jack
  • faust2jaqt
  • faust2lv2
  • faust2sc
  • open-music-kontrollers.mephisto
  • puppeteer-cli
  • sharedown
  • sitespeed-io
  • tinygo
1 package failed to build:
  • vlang
45 packages built:
  • binaryen
  • clang-tools_16
  • clang_16 (llvmPackages_16.clang ,llvmPackages_16.libcxxClang)
  • clipboard-jh
  • emscripten
  • faust (faust2)
  • faust2csound
  • faust2firefox
  • faust2jackrust
  • faust2ladspa
  • lld_16 (llvmPackages_16.lld)
  • lld_16.dev (llvmPackages_16.lld.dev)
  • lld_16.lib (llvmPackages_16.lld.lib)
  • lldb_16 (llvmPackages_16.lldb)
  • lldb_16.dev (llvmPackages_16.lldb.dev)
  • lldb_16.lib (llvmPackages_16.lldb.lib)
  • llvmPackages_16.clang-manpages
  • llvmPackages_16.libclang (llvmPackages_16.clang-unwrapped)
  • llvmPackages_16.libclang.dev (llvmPackages_16.clang-unwrapped.dev)
  • llvmPackages_16.libclang.lib (llvmPackages_16.clang-unwrapped.lib)
  • llvmPackages_16.libclang.python (llvmPackages_16.clang-unwrapped.python)
  • llvmPackages_16.clangNoCompilerRt
  • llvmPackages_16.clangNoCompilerRtWithLibc
  • llvmPackages_16.clangNoLibc
  • llvmPackages_16.clangNoLibcxx
  • llvmPackages_16.clangUseLLVM
  • llvmPackages_16.compiler-rt (llvmPackages_16.compiler-rt-libc ,llvmPackages_16.compiler-rt-no-libc)
  • llvmPackages_16.compiler-rt.dev (llvmPackages_16.compiler-rt-libc.dev)
  • llvmPackages_16.libcxx
  • llvmPackages_16.libcxx.dev
  • llvmPackages_16.stdenv (llvmPackages_16.libcxxStdenv)
  • llvmPackages_16.libcxxabi
  • llvmPackages_16.libcxxabi.dev
  • llvm_16 (llvmPackages_16.llvm)
  • llvm_16.dev (llvmPackages_16.llvm.dev)
  • llvm_16.lib (llvmPackages_16.llvm.lib)
  • llvm_16.python (llvmPackages_16.llvm.python)
  • llvmPackages_16.libstdcxxClang
  • llvmPackages_16.libunwind
  • llvmPackages_16.libunwind.dev
  • llvmPackages_16.lldb-manpages
  • llvmPackages_16.llvm-manpages
  • llvmPackages_16.openmp
  • llvmPackages_16.openmp.dev
  • vtm

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

willcohen commented Jun 5, 2023

@vcunat as you predicted, it all came down to the missing patch. should be working now. again, sorry for the need for the reverts.

@willcohen
Copy link
Contributor Author

willcohen commented Jun 16, 2023

Looks right on Darwin for me — if someone wants to do a nixpkgs-review on Linux could wait for that, otherwise looks like llvmPackages worked okay for ofborg on Linux!

@willcohen
Copy link
Contributor Author

willcohen commented Jun 16, 2023

@RaitoBezarius @vcunat Any additional questions re llvm, or does this look good?

@reckenrode reckenrode mentioned this pull request Jun 17, 2023
Closed
@nixos-discourse
Copy link

nixos-discourse commented Jun 18, 2023

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

https://discourse.nixos.org/t/prs-already-reviewed/2617/991

SuperSandro2000
SuperSandro2000 approved these changes Jun 18, 2023
View reviewed changes
@willcohen willcohen force-pushed the emscripten-wasm2c branch from 23347b0 to 0761348 Compare June 18, 2023 23:36
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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. and removed 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Jun 19, 2023
@rrbutani
Copy link
Contributor

rrbutani commented Jun 19, 2023 •
edited
Loading

@willcohen Now that #236420 has reached master (as part of the staging cycle in #237233) this will probably have to target staging, unfortunately.

@vcunat vcunat changed the base branch from master to staging June 19, 2023 06:09
@willcohen
Copy link
Contributor Author

willcohen commented Jun 20, 2023

Sounds good! Let me know if any other changes are needed.

@willcohen
Copy link
Contributor Author

willcohen commented Jun 21, 2023

Are there any changes anyone would like to see here before merge? From my perspective, it looks ready to go!

@rrbutani rrbutani added the 12.approvals: 2 This PR was reviewed and approved by two persons. label Jun 21, 2023
@willcohen
Copy link
Contributor Author

willcohen commented Jun 22, 2023

Small ping to @NixOS/nixpkgs-committers on this for merge!

@willcohen willcohen mentioned this pull request Jun 22, 2023
Closed
12 tasks
@RaitoBezarius RaitoBezarius merged commit b81d4f0 into NixOS:staging Jun 22, 2023
@RaitoBezarius
Copy link
Member

RaitoBezarius commented Jun 22, 2023

Small ping to @NixOS/nixpkgs-committers on this for merge!

Done :)

@vcunat
Copy link
Member

vcunat commented Jun 22, 2023

Well, be aware that the group has around 200 members...

@NixOS NixOS locked as too heated and limited conversation to collaborators Jun 22, 2023
@willcohen willcohen deleted the emscripten-wasm2c branch June 22, 2023 15:57
@rrbutani rrbutani added the 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related label May 27, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 approved these changes

@matthewbauer matthewbauer Awaiting requested review from matthewbauer

@qknight qknight Awaiting requested review from qknight

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@vcunat vcunat Awaiting requested review from vcunat

@alyssais alyssais Awaiting requested review from alyssais

@peterwaller-arm peterwaller-arm Awaiting requested review from peterwaller-arm

+1 more reviewer

@rrbutani rrbutani rrbutani approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must 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. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@willcohen @vcunat @rrbutani @nixos-discourse @RaitoBezarius @SuperSandro2000 @peterwaller-arm