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: 3.1.24 -> 3.1.39, binaryen: 112 -> 113 #229718

Merged
merged 4 commits into from
May 26, 2023

Conversation

willcohen
Copy link
Contributor

Description of changes
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
  • Fits CONTRIBUTING.md.

@willcohen willcohen force-pushed the emscripten-3.1.30 branch from 6b70b81 to 4a909ce Compare May 3, 2023 18:28
@willcohen willcohen force-pushed the emscripten-3.1.30 branch from 4a909ce to 727cf0e Compare May 3, 2023 20:30
@willcohen willcohen changed the title emscripten: 3.1.24 -> 3.1.30 emscripten: 3.1.24 -> 3.1.31 May 3, 2023
@RaitoBezarius
Copy link
Member

We just merged LLVM16, you can drop the patch and use LLVM16 :).

@RaitoBezarius
Copy link
Member

It does not have enough rebuilds to target staging, please target master!

@willcohen willcohen force-pushed the emscripten-3.1.30 branch from 727cf0e to 14dacfe Compare May 4, 2023 01:36
@willcohen willcohen changed the base branch from staging to master May 4, 2023 01:36
@willcohen willcohen changed the title emscripten: 3.1.24 -> 3.1.31 emscripten: 3.1.24 -> 3.1.36 May 4, 2023
@willcohen
Copy link
Contributor Author

@RaitoBezarius re-targeted to master, and also got the new version up to 3.1.36. It's still on LLVM 15 with the patch for now, since LLVM 16 isn't quite building for me on my local aarch64 mac. It's quite possible once hydra gets through another round on the master branch that I can pull a built LLVM 16 from cache and get that resolved.

@willcohen
Copy link
Contributor Author

@RaitoBezarius Per my comment in the llvm 17 thread, it looks like bumping to 16 isn't a smooth ride. It's possible that one of the 16 point releases will resolve some of the issues. I should note that emscripten's been on the LLVM 17.0.0 trunk since 3.1.31, so there's no reason to expect that 16 can/should necessarily work better than 15 at the moment. If it's okay with you, it seems like it'd be better to get this bumped to 3.1.36 using a patched LLVM 15 rather than having this stuck on a moderately-old 2022 emscripten release. Then, as I work on 3.1.37+, I'll see what else I need to back port from later 16 point releases or 17 trunk to get this working on 16/17.

@RaitoBezarius
Copy link
Member

Unless you really want this bump quickly, I would try to go and upgrade our llvmPackages_git to llvm17 and try to build emscripten against that. Not sure, it helps, but if this fails, we can merge your solution I think, I just want to avoid such type of patches on a LLVM version just for emscripten.

@willcohen
Copy link
Contributor Author

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

17 packages marked as broken and skipped:
  • faba-icon-theme
  • fast-cli
  • faust2alqt
  • faust2alsa
  • faust2jack
  • faust2jaqt
  • faust2lv2
  • gimp-with-plugins
  • go-musicfox
  • mame
  • mame-tools
  • mame-tools.tools
  • mame.tools
  • open-music-kontrollers.mephisto
  • puppeteer-cli
  • qemu_full
  • sharedown
9 packages failed to build:
  • cargo-lambda
  • cargo-zigbuild
  • linuxwave
  • ncdu
  • opentelemetry-collector
  • zf
  • zig (zig_0_10)
  • zig.doc (zig_0_10.doc)
  • zls
21 packages built:
  • cimg
  • cimg.doc
  • darktable
  • emscripten
  • erlang_24
  • faust (faust2)
  • faust2csound
  • faust2firefox
  • faust2jackrust
  • faust2ladspa
  • gimpPlugins.gmic
  • gmic
  • gmic-qt
  • gmic.dev
  • gmic.lib
  • gmic.man
  • imgcat
  • lld_15 (llvmPackages_15.lld)
  • lld_15.dev (llvmPackages_15.lld.dev)
  • lld_15.lib (llvmPackages_15.lld.lib)
  • phash

@willcohen
Copy link
Contributor Author

Makes sense. Will poke around. Besides, it's possible that this breaks zig as well, based on nixpkgs-review.

@willcohen willcohen marked this pull request as draft May 4, 2023 13:25
@willcohen willcohen force-pushed the emscripten-3.1.30 branch from 14dacfe to 489e40c Compare May 19, 2023 17:40
@willcohen willcohen marked this pull request as ready for review May 19, 2023 17:40
@willcohen willcohen changed the title emscripten: 3.1.24 -> 3.1.36 emscripten: 3.1.24 -> 3.1.39, binaryen: 112 -> 113 May 19, 2023
@willcohen
Copy link
Contributor Author

nixpkgs-review is broken for me in general with the following error, which I believe is unrelated to this PR, but nix-build $NIXPKGS -A emscripten does work now with current versions.

error:
       … while evaluating call site

       at «none»:0: (source not available)

       … while calling 'func'

       at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/pkgs/development/interpreters/python/default.nix:40:24:

           39|           valid = value: pythonPackages.hasPythonModule value || providesSetupHook value || lib.elem value exceptions;
           40|           func = name: value:
             |                        ^
           41|             if lib.isDerivation value then

       … while evaluating call site

       at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/pkgs/development/interpreters/python/default.nix:41:16:

           40|           func = name: value:
           41|             if lib.isDerivation value then
             |                ^
           42|               lib.extendDerivation (valid value || throw "${name} should use `buildPythonPackage` or `toPythonModule` if it is to be part of the Python packages set.") {} value

       … while calling 'isDerivation'

       at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/lib/attrsets.nix:636:5:

          635|     # Value to check.
          636|     value: value.type or null == "derivation";
             |     ^
          637|

       … while evaluating call site

       at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/pkgs/top-level/python-packages.nix:6444:10:

         6443|
         6444|   mung = callPackage ../development/python-modules/mung { };
             |          ^
         6445|

       … while calling 'callPackageWith'

       at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/lib/customisation.nix:128:35:

          127|   */
          128|   callPackageWith = autoArgs: fn: args:
             |                                   ^
          129|     let

       error: evaluation aborted with the following error message: 'Function called without required argument "scikitimage" at /Users/wcohen/.cache/nixpkgs-review/pr-229718-4/nixpkgs/pkgs/development/python-modules/mung/default.nix:9, did you mean "scikit-image"?'

@willcohen
Copy link
Contributor Author

Whoa. I assume that's from json-c. Moving to staging.

@willcohen willcohen changed the base branch from master to staging May 19, 2023 19:18
@willcohen
Copy link
Contributor Author

@RaitoBezarius would it be preferable that i move the json-c fix to a separate PR? My inclination is to leave it in since this PR breaks it, but it makes this touch many many more packages.

@willcohen
Copy link
Contributor Author

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

517 packages marked as broken and skipped:
  • airshipper
  • almanah
  • arcanPackages.arcan
  • arcanPackages.xarcan
  • baresip
  • biboumi
  • bluetooth_battery
  • booster
  • brickd
  • brltty
  • btrbk
  • bucklespring-libinput
  • cardboard
  • chkservice
  • cloud-init
  • cloud-init.dist
  • codecserver
  • datadog-agent
  • dbmonster
  • digiham
  • dino
  • dockle
  • dwl
  • dwl.man
  • electron-fiddle
  • emacsPackages.ac-mozc
  • emacsPackages.mozc
  • emacsPackages.mozc-cand-posframe
  • emacsPackages.mozc-im
  • emacsPackages.mozc-popup
  • emacsPackages.mozc-temp
  • entangle
  • exaile
  • fast-cli
  • faust2alqt
  • faust2alsa
  • faust2jack
  • faust2jaqt
  • faust2lv2
  • faust2sc
  • fgallery
  • filebeat
  • filebeat7
  • flycast
  • frr
  • gcr_4
  • gcr_4.bin
  • gcr_4.dev
  • gcr_4.devdoc
  • gdtoolkit
  • gdtoolkit.dist
  • gimp-with-plugins
  • gnome.nautilus-python
  • gnome.nautilus-python.dev
  • gnome.nautilus-python.devdoc
  • gnome.nautilus-python.doc
  • graylog-3_3
  • graylog-4_0
  • graylog-4_3
  • graylog-5_0
  • hid-tools
  • hid-tools.dist
  • hyprland-share-picker
  • hyprpicker
  • ibus-engines.libthai
  • idasen
  • idasen.dist
  • jpsxdec
  • kaffeine
  • kodiPackages.inputstream-adaptive
  • kodiPackages.inputstream-ffmpegdirect
  • kodiPackages.inputstream-rtmp
  • kodiPackages.joystick
  • kodiPackages.libretro
  • kodiPackages.libretro-genplus
  • kodiPackages.libretro-mgba
  • kodiPackages.libretro-snes9x
  • kodiPackages.pvr-hdhomerun
  • kodiPackages.pvr-hts
  • kodiPackages.pvr-iptvsimple
  • kodiPackages.steam-controller
  • kodiPackages.vfs-libarchive
  • kodiPackages.vfs-sftp
  • kodiPackages.visualization-waveform
  • labwc
  • latte-dock
  • ledger_agent
  • ledger_agent.dist
  • libdnf
  • liberio
  • libinput
  • libinput.bin
  • libinput.dev
  • liblogging
  • libmanette
  • libmanette.dev
  • libmanette.devdoc
  • libretro.dolphin
  • libsForQt5.alkimia
  • lightly-boehs
  • lightly-qt
  • linux-wifi-hotspot
  • lorien
  • malcontent
  • malcontent-ui
  • malcontent-ui.dev
  • malcontent-ui.lib
  • malcontent.bin
  • malcontent.dev
  • malcontent.installedTests
  • malcontent.lib
  • malcontent.man
  • malcontent.pam
  • mate.mate-power-manager
  • mate.mate-screensaver
  • mate.mate-session-manager
  • mate.mate-system-monitor
  • mate.mate-utils
  • matrix-synapse
  • matrix-synapse-plugins.matrix-synapse-ldap3
  • matrix-synapse-plugins.matrix-synapse-ldap3.dist
  • matrix-synapse-plugins.matrix-synapse-mjolnir-antispam
  • matrix-synapse-plugins.matrix-synapse-mjolnir-antispam.dist
  • matrix-synapse-plugins.matrix-synapse-shared-secret-auth
  • matrix-synapse-plugins.matrix-synapse-shared-secret-auth.dist
  • matrix-synapse.dist
  • mautrix-facebook
  • mautrix-facebook.dist
  • microdnf
  • mirakurun
  • mojave-gtk-theme
  • neard
  • neard.dev
  • networkmanager_dmenu
  • ntopng
  • onboard
  • onboard.dist
  • open-music-kontrollers.mephisto
  • openwebrx
  • openwebrx.dist
  • ostree-rs-ext
  • oversteer
  • passExtensions.pass-tomb
  • pdns
  • perl534Packages.LogJournald
  • perl534Packages.LogJournald.devdoc
  • perl536Packages.LogJournald
  • perl536Packages.LogJournald.devdoc
  • picard
  • picard.dist
  • piglit
  • plasma5Packages.alkimia
  • prometheus-postfix-exporter
  • pulseaudioFull
  • pulseaudioFull.dev
  • puppeteer-cli
  • pykms
  • python310Packages.adax-local
  • python310Packages.adax-local.dist
  • python310Packages.aiohomekit
  • python310Packages.aiohomekit.dist
  • python310Packages.airthings-ble
  • python310Packages.airthings-ble.dist
  • python310Packages.aranet4
  • python310Packages.aranet4.dist
  • python310Packages.atc-ble
  • python310Packages.atc-ble.dist
  • python310Packages.bleak-retry-connector
  • python310Packages.bleak-retry-connector.dist
  • python310Packages.bless
  • python310Packages.bless.dist
  • python310Packages.bluemaestro-ble
  • python310Packages.bluemaestro-ble.dist
  • python310Packages.bluetooth-adapters
  • python310Packages.bluetooth-adapters.dist
  • python310Packages.bluetooth-adapters.doc
  • python310Packages.bluetooth-sensor-state-data
  • python310Packages.bluetooth-sensor-state-data.dist
  • python310Packages.bt-proximity
  • python310Packages.bt-proximity.dist
  • python310Packages.bthome-ble
  • python310Packages.bthome-ble.dist
  • python310Packages.btrfsutil
  • python310Packages.btrfsutil.dist
  • python310Packages.cometblue-lite
  • python310Packages.cometblue-lite.dist
  • python310Packages.django-scim2
  • python310Packages.django-scim2.dist
  • python310Packages.ds4drv
  • python310Packages.ds4drv.dist
  • python310Packages.eufylife-ble-client
  • python310Packages.eufylife-ble-client.dist
  • python310Packages.fjaraskupan
  • python310Packages.fjaraskupan.dist
  • python310Packages.gattlib
  • python310Packages.gattlib.dist
  • python310Packages.govee-ble
  • python310Packages.govee-ble.dist
  • python310Packages.guestfs
  • python310Packages.guestfs.dist
  • python310Packages.halohome
  • python310Packages.halohome.dist
  • python310Packages.home-assistant-bluetooth
  • python310Packages.home-assistant-bluetooth.dist
  • python310Packages.homeassistant-pyozw
  • python310Packages.homeassistant-pyozw.dist
  • python310Packages.homeassistant-stubs
  • python310Packages.homeassistant-stubs.dist
  • python310Packages.ibeacon-ble
  • python310Packages.ibeacon-ble.dist
  • python310Packages.idasen
  • python310Packages.idasen.dist
  • python310Packages.inkbird-ble
  • python310Packages.inkbird-ble.dist
  • python310Packages.journalwatch
  • python310Packages.journalwatch.dist
  • python310Packages.kegtron-ble
  • python310Packages.kegtron-ble.dist
  • python310Packages.ld2410-ble
  • python310Packages.ld2410-ble.dist
  • python310Packages.led-ble
  • python310Packages.led-ble.dist
  • python310Packages.ledger_agent
  • python310Packages.ledger_agent.dist
  • python310Packages.ledgerblue
  • python310Packages.ledgerblue.dist
  • python310Packages.moat-ble
  • python310Packages.moat-ble.dist
  • python310Packages.mopeka-iot-ble
  • python310Packages.mopeka-iot-ble.dist
  • python310Packages.nxt-python
  • python310Packages.nxt-python.dist
  • python310Packages.oralb-ble
  • python310Packages.oralb-ble.dist
  • python310Packages.paperwork-backend
  • python310Packages.paperwork-backend.dist
  • python310Packages.paperwork-shell
  • python310Packages.paperwork-shell.dist
  • python310Packages.py-dormakaba-dkey
  • python310Packages.py-dormakaba-dkey.dist
  • python310Packages.pybluez
  • python310Packages.pybluez.dist
  • python310Packages.pycec
  • python310Packages.pycec.dist
  • python310Packages.pydigiham
  • python310Packages.pydigiham.dist
  • python310Packages.pygmt
  • python310Packages.pygmt.dist
  • python310Packages.pykulersky
  • python310Packages.pykulersky.dist
  • python310Packages.pymicrobot
  • python310Packages.pymicrobot.dist
  • python310Packages.pysnooz
  • python310Packages.pysnooz.dist
  • python310Packages.pystemd
  • python310Packages.pystemd.dist
  • python310Packages.python-gammu
  • python310Packages.python-gammu.dist
  • python310Packages.python-uinput
  • python310Packages.python-uinput.dist
  • python310Packages.python-vlc
  • python310Packages.python-vlc.dist
  • python310Packages.pyudev
  • python310Packages.pyudev.dist
  • python310Packages.qingping-ble
  • python310Packages.qingping-ble.dist
  • python310Packages.qtile-extras
  • python310Packages.qtile-extras.dist
  • python310Packages.rapt-ble
  • python310Packages.rapt-ble.dist
  • python310Packages.rtslib
  • python310Packages.rtslib.dist
  • python310Packages.ruuvitag-ble
  • python310Packages.ruuvitag-ble.dist
  • python310Packages.sensorpro-ble
  • python310Packages.sensorpro-ble.dist
  • python310Packages.sensorpush-ble
  • python310Packages.sensorpush-ble.dist
  • python310Packages.systemd
  • python310Packages.systemd.dist
  • python310Packages.thermobeacon-ble
  • python310Packages.thermobeacon-ble.dist
  • python310Packages.thermopro-ble
  • python310Packages.thermopro-ble.dist
  • python310Packages.tilt-ble
  • python310Packages.tilt-ble.dist
  • python310Packages.tpm2-pytss
  • python310Packages.tpm2-pytss.dist
  • python310Packages.xiaomi-ble
  • python310Packages.xiaomi-ble.dist
  • python310Packages.yalexs-ble
  • python310Packages.yalexs-ble.dist
  • python311Packages.adax-local
  • python311Packages.adax-local.dist
  • python311Packages.aiohomekit
  • python311Packages.aiohomekit.dist
  • python311Packages.airthings-ble
  • python311Packages.airthings-ble.dist
  • python311Packages.aranet4
  • python311Packages.aranet4.dist
  • python311Packages.atc-ble
  • python311Packages.atc-ble.dist
  • python311Packages.bleak-retry-connector
  • python311Packages.bleak-retry-connector.dist
  • python311Packages.bless
  • python311Packages.bless.dist
  • python311Packages.bluemaestro-ble
  • python311Packages.bluemaestro-ble.dist
  • python311Packages.bluetooth-adapters
  • python311Packages.bluetooth-adapters.dist
  • python311Packages.bluetooth-adapters.doc
  • python311Packages.bluetooth-sensor-state-data
  • python311Packages.bluetooth-sensor-state-data.dist
  • python311Packages.bt-proximity
  • python311Packages.bt-proximity.dist
  • python311Packages.bthome-ble
  • python311Packages.bthome-ble.dist
  • python311Packages.btrfsutil
  • python311Packages.btrfsutil.dist
  • python311Packages.cometblue-lite
  • python311Packages.cometblue-lite.dist
  • python311Packages.django-scim2
  • python311Packages.django-scim2.dist
  • python311Packages.ds4drv
  • python311Packages.ds4drv.dist
  • python311Packages.eufylife-ble-client
  • python311Packages.eufylife-ble-client.dist
  • python311Packages.fjaraskupan
  • python311Packages.fjaraskupan.dist
  • python311Packages.gattlib
  • python311Packages.gattlib.dist
  • python311Packages.govee-ble
  • python311Packages.govee-ble.dist
  • python311Packages.guestfs
  • python311Packages.guestfs.dist
  • python311Packages.halohome
  • python311Packages.halohome.dist
  • python311Packages.home-assistant-bluetooth
  • python311Packages.home-assistant-bluetooth.dist
  • python311Packages.homeassistant-pyozw
  • python311Packages.homeassistant-pyozw.dist
  • python311Packages.ibeacon-ble
  • python311Packages.ibeacon-ble.dist
  • python311Packages.idasen
  • python311Packages.idasen.dist
  • python311Packages.inkbird-ble
  • python311Packages.inkbird-ble.dist
  • python311Packages.journalwatch
  • python311Packages.journalwatch.dist
  • python311Packages.kegtron-ble
  • python311Packages.kegtron-ble.dist
  • python311Packages.ld2410-ble
  • python311Packages.ld2410-ble.dist
  • python311Packages.led-ble
  • python311Packages.led-ble.dist
  • python311Packages.ledger_agent
  • python311Packages.ledger_agent.dist
  • python311Packages.ledgerblue
  • python311Packages.ledgerblue.dist
  • python311Packages.moat-ble
  • python311Packages.moat-ble.dist
  • python311Packages.mopeka-iot-ble
  • python311Packages.mopeka-iot-ble.dist
  • python311Packages.nxt-python
  • python311Packages.nxt-python.dist
  • python311Packages.oralb-ble
  • python311Packages.oralb-ble.dist
  • python311Packages.paperwork-backend
  • python311Packages.paperwork-backend.dist
  • python311Packages.paperwork-shell
  • python311Packages.paperwork-shell.dist
  • python311Packages.py-dormakaba-dkey
  • python311Packages.py-dormakaba-dkey.dist
  • python311Packages.pybluez
  • python311Packages.pybluez.dist
  • python311Packages.pycec
  • python311Packages.pycec.dist
  • python311Packages.pydigiham
  • python311Packages.pydigiham.dist
  • python311Packages.pygmt
  • python311Packages.pygmt.dist
  • python311Packages.pykulersky
  • python311Packages.pykulersky.dist
  • python311Packages.pymicrobot
  • python311Packages.pymicrobot.dist
  • python311Packages.pysnooz
  • python311Packages.pysnooz.dist
  • python311Packages.pystemd
  • python311Packages.pystemd.dist
  • python311Packages.python-gammu
  • python311Packages.python-gammu.dist
  • python311Packages.python-uinput
  • python311Packages.python-uinput.dist
  • python311Packages.python-vlc
  • python311Packages.python-vlc.dist
  • python311Packages.pyudev
  • python311Packages.pyudev.dist
  • python311Packages.qingping-ble
  • python311Packages.qingping-ble.dist
  • python311Packages.qtile-extras
  • python311Packages.qtile-extras.dist
  • python311Packages.rapt-ble
  • python311Packages.rapt-ble.dist
  • python311Packages.rtslib
  • python311Packages.rtslib.dist
  • python311Packages.ruuvitag-ble
  • python311Packages.ruuvitag-ble.dist
  • python311Packages.sensorpro-ble
  • python311Packages.sensorpro-ble.dist
  • python311Packages.sensorpush-ble
  • python311Packages.sensorpush-ble.dist
  • python311Packages.systemd
  • python311Packages.systemd.dist
  • python311Packages.thermobeacon-ble
  • python311Packages.thermobeacon-ble.dist
  • python311Packages.thermopro-ble
  • python311Packages.thermopro-ble.dist
  • python311Packages.tilt-ble
  • python311Packages.tilt-ble.dist
  • python311Packages.tpm2-pytss
  • python311Packages.tpm2-pytss.dist
  • python311Packages.xiaomi-ble
  • python311Packages.xiaomi-ble.dist
  • python311Packages.yalexs-ble
  • python311Packages.yalexs-ble.dist
  • qemu_full
  • qemu_xen
  • qemu_xen-light
  • qemu_xen_4_15
  • qemu_xen_4_15-light
  • qlcplus
  • qmk_hid
  • quodlibet
  • quodlibet-full
  • quodlibet-full.dist
  • quodlibet-full.doc
  • quodlibet-without-gst-plugins
  • quodlibet-without-gst-plugins.dist
  • quodlibet-without-gst-plugins.doc
  • quodlibet-xine
  • quodlibet-xine-full
  • quodlibet-xine-full.dist
  • quodlibet-xine-full.doc
  • quodlibet-xine.dist
  • quodlibet-xine.doc
  • quodlibet.dist
  • quodlibet.doc
  • retroarchFull
  • rpcbind
  • rshell
  • rshell.dist
  • rubyPackages.ruby-lxc
  • rubyPackages_2_7.ruby-lxc
  • rubyPackages_3_0.ruby-lxc
  • rubyPackages_3_1.ruby-lxc
  • rubyPackages_3_2.ruby-lxc
  • run-scaled
  • sanoid
  • shairport-sync
  • sharedown
  • strongswanNM
  • stubby
  • stubby.man
  • stubby.stubbyExampleJson
  • sublime-music
  • sublime-music.dist
  • subsurface
  • sway-contrib.grimshot
  • sway-contrib.grimshot.man
  • sysprof
  • sysprof.dev
  • sysprof.lib
  • telepresence
  • telepresence.dist
  • tinygo
  • toppler
  • tvheadend
  • tvheadend.man
  • udiskie
  • udiskie.dist
  • uhub
  • unbound-full
  • unbound-full.lib
  • unbound-full.man
  • unbound-with-systemd
  • unbound-with-systemd.lib
  • unbound-with-systemd.man
  • update-resolv-conf
  • utox
  • vimix-gtk-themes
  • waffle
  • waybar
  • wayfire
  • wayfireApplications-unwrapped.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wayfire
  • wayfireApplications-unwrapped.wayfirePlugins.wf-shell
  • wayfireApplications-unwrapped.wcm
  • wayfirePlugins.wayfire
  • wayfirePlugins.wf-shell
  • wcm
  • webcord
  • webcord-vencord
  • whitesur-gtk-theme
  • x11basic
  • xdg-desktop-portal-hyprland
  • xfce.xfce4-weather-plugin
  • xorg.xf86inputevdev
  • xorg.xf86inputevdev.dev
  • xorg.xf86inputlibinput
  • xorg.xf86inputlibinput.dev
  • xorg.xf86videoamdgpu
  • xorg.xf86videoati
  • xorg.xf86videonouveau
  • xorg.xf86videoopenchrome
  • xorg.xf86videoqxl
  • zpool-auto-expand-partitions
  • zram-generator
1 package blacklisted:
  • darwin.builder
117 packages failed to build:
  • clamav
  • emscripten
  • faust (faust2)
  • faust2csound
  • faust2firefox
  • faust2jackrust
  • faust2ladspa
  • gdal (python310Packages.gdal)
  • gen-oath-safe
  • gimp (gimpPlugins.gimp)
  • gimp.dev (gimpPlugins.gimp.dev)
  • gimpPlugins.gmic
  • gplates
  • grass
  • haskellPackages.hgdal
  • haskellPackages.hgdal.doc
  • libLAS
  • mapcache
  • mapnik
  • mapproxy
  • mapproxy.dist
  • mapserver
  • merkaartor
  • mpris-scrobbler
  • newsboat
  • openorienteering-mapper
  • pdal
  • perl534Packages.Tirex
  • perl534Packages.Tirex.devdoc
  • perl536Packages.Tirex
  • perl536Packages.Tirex.devdoc
  • pianobar
  • postgresql11JitPackages.postgis
  • postgresql11JitPackages.postgis.doc
  • postgresql11Packages.postgis
  • postgresql11Packages.postgis.doc
  • postgresql12JitPackages.postgis
  • postgresql12JitPackages.postgis.doc
  • postgresql12Packages.postgis
  • postgresql12Packages.postgis.doc
  • postgresql13JitPackages.postgis
  • postgresql13JitPackages.postgis.doc
  • postgresql13Packages.postgis
  • postgresql13Packages.postgis.doc
  • postgresqlJitPackages.postgis (postgresql14JitPackages.postgis)
  • postgresqlJitPackages.postgis.doc (postgresql14JitPackages.postgis.doc)
  • postgresqlPackages.postgis (postgresql14Packages.postgis)
  • postgresqlPackages.postgis.doc (postgresql14Packages.postgis.doc)
  • postgresql15JitPackages.postgis
  • postgresql15JitPackages.postgis.doc
  • postgresql15Packages.postgis
  • postgresql15Packages.postgis.doc
  • pwsafe
  • python310Packages.bsuite
  • python310Packages.bsuite.dist
  • python310Packages.cartopy
  • python310Packages.cartopy.dist
  • python310Packages.django-bootstrap4
  • python310Packages.django-bootstrap4.dist
  • python310Packages.fiona
  • python310Packages.fiona.dist
  • python310Packages.folium
  • python310Packages.folium.dist
  • python310Packages.geopandas
  • python310Packages.geopandas.dist
  • python310Packages.osmnx
  • python310Packages.osmnx.dist
  • python310Packages.plotnine
  • python310Packages.plotnine.dist
  • python310Packages.python-mapnik
  • python310Packages.python-mapnik.dist
  • python310Packages.rasterio
  • python310Packages.rasterio.dist
  • python310Packages.rlax
  • python310Packages.rlax.dist
  • python310Packages.wktutils
  • python310Packages.wktutils.dist
  • worldengine-cli (python310Packages.worldengine)
  • worldengine-cli.dist (python310Packages.worldengine.dist)
  • python311Packages.bsuite
  • python311Packages.bsuite.dist
  • python311Packages.cartopy
  • python311Packages.cartopy.dist
  • python311Packages.django-bootstrap4
  • python311Packages.django-bootstrap4.dist
  • python311Packages.fiona
  • python311Packages.fiona.dist
  • python311Packages.folium
  • python311Packages.folium.dist
  • python311Packages.gdal
  • python311Packages.geopandas
  • python311Packages.geopandas.dist
  • python311Packages.osmnx
  • python311Packages.osmnx.dist
  • python311Packages.plotnine
  • python311Packages.plotnine.dist
  • python311Packages.python-mapnik
  • python311Packages.python-mapnik.dist
  • python311Packages.rasterio
  • python311Packages.rasterio.dist
  • python311Packages.wktutils
  • python311Packages.wktutils.dist
  • python311Packages.worldengine
  • python311Packages.worldengine.dist
  • rootbar
  • saga
  • t-rex
  • uclient
  • vhs
  • vlang
  • yubikey-manager
  • yubikey-manager.dist
  • yubikey-manager4
  • yubikey-manager4.dist
  • yubikey-personalization-gui
  • zmap
  • zmap.man
35 packages built:
  • binaryen
  • hubicfuse
  • json_c
  • json_c.dev
  • ldmud
  • ldmud-full
  • liblognorm
  • libmypaint
  • libmypaint.dev
  • libu2f-host
  • libubox
  • libubox-mbedtls
  • libubox-nossl
  • libubox-wolfssl
  • mpw
  • ndpi
  • poke
  • poke.dev
  • poke.info
  • poke.lib
  • poke.man
  • rnp
  • rnp.dev
  • rnp.lib
  • spectre-cli
  • ssldump
  • ttyd
  • ttyd.man
  • ubus
  • uci
  • uqmi
  • ustream-ssl
  • ustream-ssl-mbedtls
  • ustream-ssl-wolfssl
  • yubikey-personalization

@RaitoBezarius
Copy link
Member

@RaitoBezarius would it be preferable that i move the json-c fix to a separate PR? My inclination is to leave it in since this PR breaks it, but it makes this touch many many more packages.

It's fine to keep it here IMHO, targeting staging is the good call.

@willcohen willcohen force-pushed the emscripten-3.1.30 branch from b4d35b2 to 5d0918e Compare May 22, 2023 13:26
@willcohen
Copy link
Contributor Author

nixpkgs-review is broken for me on staging still, but I can at least confirm that the emscriptenPackages all build locally on this branch using nix-build. This also fixes an unrelated issue where libxml2's emscripten packages was broken on darwin due to an incorrect extension.

@willcohen
Copy link
Contributor Author

@RaitoBezarius I think this is ready for staging.

(Results on master, where I can at least pull the prereqs from cache):

$ nix-build ~/programming/nix/nixpkgs -A emscriptenPackages.json_c -A emscriptenPackages.zlib -A emscripten -A emscriptenPackages.libxml2 -A emscriptenPackages.xmlmirror -A binaryen
/nix/store/1ilwpk80dl7f4kb11sf6iczz55l6g74r-emscripten-json-c-0.16
/nix/store/rsks0vw7l26qasw080wagz79x6bsd8pw-emscripten-zlib-1.2.13
/nix/store/g5sil48v6pjr1rlf087mqkxbzma8vjpd-emscripten-3.1.39
/nix/store/pycyj2iafcyhl3nm0y4dnp08chkj1zrq-emscripten-libxml2-2.10.4-bin
/nix/store/xpmi39bp1pkx441ya02gjrfwqymz1gbv-emscripten-xmlmirror-unstable-2016-06-05
/nix/store/y847yx7s5dqdqdrn7v18s5csv1c2ilfl-binaryen-113

@RaitoBezarius
Copy link
Member

I won't be able to look seriously right now as I will perform my release duties in the next 48 hours for 23.05.
Ping me if I forgot on Wednesday or Thursday. :)

@willcohen
Copy link
Contributor Author

Of course, good luck!

@willcohen
Copy link
Contributor Author

@RaitoBezarius small ping. if this still need to wait till the following week pending release stuff, that is of course fine too!

Copy link
Member

@RaitoBezarius RaitoBezarius left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, let's go :)

@RaitoBezarius RaitoBezarius merged commit 4890a4a into NixOS:staging May 26, 2023
@willcohen
Copy link
Contributor Author

Many thanks!

@willcohen willcohen deleted the emscripten-3.1.30 branch May 26, 2023 14:17
@vcunat
Copy link
Member

vcunat commented Jun 3, 2023

nix build -f. emscripten.src
error: hash mismatch in fixed-output derivation '/nix/store/zxmw0d6bzsxlils72gsya9vqd25307s9-source.drv':
         specified: sha256-hgndNMx+hvXyLzn6ip8Fhs+LAw98P3cqL8dJ+92jJmU=
            got:    sha256-woSod6Zd5zCcI/L+fs0SOCl4EKQKCDVvtQpcBWxBdTY=

Also on Hydra:
https://hydra.nixos.org/build/222636706/nixlog/1/tail

@vcunat
Copy link
Member

vcunat commented Jun 3, 2023

OfBorg could build the source around a week ago, so apparently upstream changed it?

@willcohen
Copy link
Contributor Author

Thank you for catching, I guess I'd been working on local pulls and hadn't noticed a change. Updated #235624 accordingly.

vcunat added a commit that referenced this pull request Jun 5, 2023
This reverts commit 8392a8b.
It's needed for emscripten revert; see the next commit.
vcunat added a commit that referenced this pull request Jun 5, 2023
This reverts commit 39d2924.
Now it will at least fetch sources FIXME correctly and build on *-linux.
@willcohen willcohen mentioned this pull request Jan 2, 2024
13 tasks
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.

3 participants