diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index 34f87b91e179..013156bf26a3 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -1,6 +1,27 @@ # This file is used by .github/workflows/labels.yml # This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label +# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1 + +"6.topic: policy discussion": + - any: + - changed-files: + - any-glob-to-any-file: + - .github/**/* + - CONTRIBUTING.md + - pkgs/README.md + - nixos/README.md + - maintainers/README.md + - lib/README.md + - doc/README.md + +"8.has: documentation": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/**/* + - nixos/doc/**/* + "backport release-24.11": - any: - changed-files: @@ -41,21 +62,4 @@ - pkgs/kde/gear/falkon/**/* - pkgs/kde/gear/konqueror/**/* -"6.topic: policy discussion": - - any: - - changed-files: - - any-glob-to-any-file: - - .github/**/* - - CONTRIBUTING.md - - pkgs/README.md - - nixos/README.md - - maintainers/README.md - - lib/README.md - - doc/README.md - -"8.has: documentation": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/**/* - - nixos/doc/**/* +# keep-sorted end diff --git a/.github/labeler.yml b/.github/labeler.yml index 4c86c6efa30b..78bfb4483c2b 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -1,6 +1,8 @@ # This file is used by .github/workflows/labels.yml # This version uses `sync-labels: true`, meaning that a non-match will remove the label +# keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1 + # NOTE: bsd, darwin and cross-compilation labels are handled by ofborg "6.topic: agda": - any: @@ -320,6 +322,16 @@ - any-glob-to-any-file: - pkgs/os-specific/linux/musl/**/* +"6.topic: nim": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/nim.section.md + - pkgs/build-support/build-nim-package.nix + - pkgs/build-support/build-nim-sbom.nix + - pkgs/by-name/ni/nim* + - pkgs/top-level/nim-overrides.nix + "6.topic: nixos": - any: - changed-files: @@ -336,16 +348,6 @@ - nixos/modules/virtualisation/nixos-containers.nix - pkgs/tools/virtualization/nixos-container/**/* -"6.topic: nim": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/languages-frameworks/nim.section.md - - pkgs/build-support/build-nim-package.nix - - pkgs/build-support/build-nim-sbom.nix - - pkgs/by-name/ni/nim* - - pkgs/top-level/nim-overrides.nix - "6.topic: nodejs": - any: - changed-files: @@ -492,14 +494,6 @@ - any-glob-to-any-file: - maintainers/team-list.nix -"6.topic: TeX": - - any: - - changed-files: - - any-glob-to-any-file: - - doc/languages-frameworks/texlive.section.md - - pkgs/test/texlive/** - - pkgs/tools/typesetting/tex/**/* - "6.topic: testing": - any: - changed-files: @@ -516,6 +510,14 @@ - nixos/tests/make-test-python.nix # legacy # lib/debug.nix has a test framework (runTests) but it's not the main focus +"6.topic: TeX": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/texlive.section.md + - pkgs/test/texlive/** + - pkgs/tools/typesetting/tex/**/* + "6.topic: updaters": - any: - changed-files: @@ -579,13 +581,16 @@ - any-glob-to-any-file: - nixos/doc/manual/release-notes/**/* -"8.has: module (update)": - - any: - - changed-files: - - any-glob-to-any-file: - - nixos/modules/**/* "8.has: maintainer-list (update)": - any: - changed-files: - any-glob-to-any-file: - maintainers/maintainer-list.nix + +"8.has: module (update)": + - any: + - changed-files: + - any-glob-to-any-file: + - nixos/modules/**/* + +# keep-sorted end diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 202c1ee6c741..18664befdbbe 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4213,6 +4213,12 @@ githubId = 40013212; name = "Han Jeongjun"; }; + ch4og = { + email = "mitanick@ya.ru"; + github = "ch4og"; + githubId = 32384814; + name = "Nikita Mitasov"; + }; chaduffy = { email = "charles@dyfis.net"; github = "charles-dyfis-net"; @@ -10322,6 +10328,12 @@ githubId = 7481521; name = "Balázs Lengyel"; }; + ik-nz = { + email = "me@igk.nz"; + github = "ik-nz"; + githubId = 207392575; + name = "Isaac Kabel"; + }; ilarvne = { email = "ilarvne@proton.me"; github = "ilarvne"; diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix index 782d645cab07..42b91ff9628a 100644 --- a/nixos/modules/config/i18n.nix +++ b/nixos/modules/config/i18n.nix @@ -6,13 +6,15 @@ }: let aggregatedLocales = - builtins.map + (builtins.map (l: (lib.replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( [ config.i18n.defaultLocale ] - ++ config.i18n.extraLocales + ++ (lib.optionals (builtins.isList config.i18n.extraLocales) config.i18n.extraLocales) ++ (lib.attrValues (lib.filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) - ); + ) + ) + ++ (lib.optional (builtins.isString config.i18n.extraLocales) config.i18n.extraLocales); in { ###### interface @@ -53,13 +55,14 @@ in }; extraLocales = lib.mkOption { - type = lib.types.listOf lib.types.str; + type = lib.types.either (lib.types.listOf lib.types.str) (lib.types.enum [ "all" ]); default = [ ]; example = [ "nl_NL.UTF-8" ]; description = '' Additional locales that the system should support, besides the ones configured with {option}`i18n.defaultLocale` and {option}`i18n.extraLocaleSettings`. + Set this to `"all"` to install all available locales. ''; }; @@ -108,7 +111,13 @@ in config = { warnings = - lib.optional ((lib.subtractLists config.i18n.supportedLocales aggregatedLocales) != [ ]) + lib.optional + ( + !( + (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ] + || lib.any (x: x == "all") config.i18n.supportedLocales + ) + ) '' `i18n.supportedLocales` is deprecated in favor of `i18n.extraLocales`, and it seems you are using `i18n.supportedLocales` and forgot to diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index d84be512b39f..884bac80f1b2 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -91,6 +91,12 @@ in The input method method package. ''; }; + + enableGtk2 = lib.mkEnableOption "Gtk2 support"; + + enableGtk3 = lib.mkEnableOption "Gtk3 support" // { + default = true; + }; }; }; @@ -98,11 +104,12 @@ in warnings = lib.optional (cfg.enabled != null) "i18n.inputMethod.enabled will be removed in a future release. Please use .type, and .enable = true instead"; - environment.systemPackages = [ - cfg.package - gtk2_cache - gtk3_cache - ]; + environment.systemPackages = + [ + cfg.package + ] + ++ lib.optional cfg.enableGtk2 gtk2_cache + ++ lib.optional cfg.enableGtk3 gtk3_cache; }; meta = { diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 74ebccefa685..85b41c4538d3 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,4 +1,5 @@ [ + # keep-sorted start case=no numeric=yes ./config/appstream.nix ./config/console.nix ./config/debug-info.nix @@ -16,10 +17,10 @@ ./config/malloc.nix ./config/mysql.nix ./config/networking.nix - ./config/nix.nix ./config/nix-channel.nix ./config/nix-flakes.nix ./config/nix-remote-build.nix + ./config/nix.nix ./config/nsswitch.nix ./config/power-management.nix ./config/qt.nix @@ -55,8 +56,8 @@ ./hardware/coral.nix ./hardware/corectrl.nix ./hardware/cpu/amd-microcode.nix - ./hardware/cpu/amd-sev.nix ./hardware/cpu/amd-ryzen-smu.nix + ./hardware/cpu/amd-sev.nix ./hardware/cpu/intel-microcode.nix ./hardware/cpu/intel-sgx.nix ./hardware/cpu/x86-msr.nix @@ -121,8 +122,8 @@ ./hardware/video/webcam/ipu6.nix ./hardware/wooting.nix ./hardware/xone.nix - ./hardware/xpadneo.nix ./hardware/xpad-noone.nix + ./hardware/xpadneo.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx5.nix ./i18n/input-method/hime.nix @@ -144,8 +145,8 @@ ./misc/mandoc.nix ./misc/meta.nix ./misc/nixops-autoluks.nix - ./misc/nixpkgs.nix ./misc/nixpkgs-flake.nix + ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix ./misc/wordlist.nix @@ -167,8 +168,8 @@ ./programs/bash/blesh.nix ./programs/bash/ls-colors.nix ./programs/bash/undistract-me.nix - ./programs/bazecor.nix ./programs/bat.nix + ./programs/bazecor.nix ./programs/bcc.nix ./programs/benchexec.nix ./programs/browserpass.nix @@ -180,10 +181,10 @@ ./programs/chromium.nix ./programs/clash-verge.nix ./programs/cnping.nix - ./programs/cpu-energy-meter.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix ./programs/corefreq.nix + ./programs/cpu-energy-meter.nix ./programs/criu.nix ./programs/darling.nix ./programs/dconf.nix @@ -215,8 +216,8 @@ ./programs/gdk-pixbuf.nix ./programs/geary.nix ./programs/ghidra.nix - ./programs/git.nix ./programs/git-worktree-switcher.nix + ./programs/git.nix ./programs/gnome-disks.nix ./programs/gnome-terminal.nix ./programs/gnupg.nix @@ -227,23 +228,23 @@ ./programs/haguichi.nix ./programs/hamster.nix ./programs/htop.nix + ./programs/i3lock.nix ./programs/iay.nix ./programs/iftop.nix - ./programs/i3lock.nix ./programs/iio-hyprland.nix ./programs/immersed.nix ./programs/iotop.nix ./programs/java.nix ./programs/joycond-cemuhook.nix ./programs/k3b.nix - ./programs/kde-pim.nix ./programs/k40-whisperer.nix ./programs/kbdlight.nix ./programs/kclock.nix + ./programs/kde-pim.nix ./programs/kdeconnect.nix + ./programs/kubeswitch.nix ./programs/ladybird.nix ./programs/lazygit.nix - ./programs/kubeswitch.nix ./programs/less.nix ./programs/liboping.nix ./programs/light.nix @@ -273,10 +274,10 @@ ./programs/npm.nix ./programs/ns-usbloader.nix ./programs/oblogout.nix + ./programs/obs-studio.nix ./programs/oddjobd.nix ./programs/opengamepadui.nix ./programs/openvpn3.nix - ./programs/obs-studio.nix ./programs/partition-manager.nix ./programs/pay-respects.nix ./programs/plotinus.nix @@ -293,8 +294,8 @@ ./programs/rush.nix ./programs/rust-motd.nix ./programs/ryzen-monitor-ng.nix - ./programs/screen.nix ./programs/schroot.nix + ./programs/screen.nix ./programs/seahorse.nix ./programs/sedutil.nix ./programs/shadow.nix @@ -330,8 +331,8 @@ ./programs/vivid.nix ./programs/wavemon.nix ./programs/wayland/cardboard.nix - ./programs/wayland/hyprlock.nix ./programs/wayland/hyprland.nix + ./programs/wayland/hyprlock.nix ./programs/wayland/labwc.nix ./programs/wayland/miracle-wm.nix ./programs/wayland/niri.nix @@ -343,8 +344,8 @@ ./programs/weylus.nix ./programs/winbox.nix ./programs/wireshark.nix - ./programs/xastir.nix ./programs/wshowkeys.nix + ./programs/xastir.nix ./programs/xfconf.nix ./programs/xfs_quota.nix ./programs/xonsh.nix @@ -387,8 +388,8 @@ ./security/rngd.nix ./security/rtkit.nix ./security/soteria.nix - ./security/sudo.nix ./security/sudo-rs.nix + ./security/sudo.nix ./security/systemd-confinement.nix ./security/tpm2.nix ./security/wrappers/default.nix @@ -441,11 +442,11 @@ ./services/backup/mysql-backup.nix ./services/backup/postgresql-backup.nix ./services/backup/postgresql-wal-receiver.nix - ./services/backup/snapraid.nix ./services/backup/restic-rest-server.nix ./services/backup/restic.nix ./services/backup/rsnapshot.nix ./services/backup/sanoid.nix + ./services/backup/snapraid.nix ./services/backup/syncoid.nix ./services/backup/tarsnap.nix ./services/backup/tsm.nix @@ -506,8 +507,8 @@ ./services/databases/firebird.nix ./services/databases/foundationdb.nix ./services/databases/hbase-standalone.nix - ./services/databases/influxdb.nix ./services/databases/influxdb2.nix + ./services/databases/influxdb.nix ./services/databases/lldap.nix ./services/databases/memcached.nix ./services/databases/monetdb.nix @@ -532,15 +533,14 @@ ./services/desktops/blueman.nix ./services/desktops/bonsaid.nix ./services/desktops/cpupower-gui.nix - ./services/desktops/deepin/deepin-anything.nix - ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/app-services.nix + ./services/desktops/deepin/dde-api.nix ./services/desktops/deepin/dde-daemon.nix + ./services/desktops/deepin/deepin-anything.nix ./services/desktops/dleyna.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix - ./services/desktops/playerctld.nix ./services/desktops/gnome/at-spi2-core.nix ./services/desktops/gnome/evolution-data-server.nix ./services/desktops/gnome/glib-networking.nix @@ -561,10 +561,11 @@ ./services/desktops/neard.nix ./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/wireplumber.nix + ./services/desktops/playerctld.nix ./services/desktops/profile-sync-daemon.nix ./services/desktops/seatd.nix - ./services/desktops/system-config-printer.nix ./services/desktops/system76-scheduler.nix + ./services/desktops/system-config-printer.nix ./services/desktops/telepathy.nix ./services/desktops/tumbler.nix ./services/desktops/wlock.nix @@ -583,11 +584,11 @@ ./services/development/rstudio-server/default.nix ./services/development/vsmartcard-vpcd.nix ./services/development/zammad.nix - ./services/display-managers/default.nix ./services/display-managers/cosmic-greeter.nix + ./services/display-managers/default.nix ./services/display-managers/greetd.nix - ./services/display-managers/sddm.nix ./services/display-managers/ly.nix + ./services/display-managers/sddm.nix ./services/editors/emacs.nix ./services/editors/haste.nix ./services/editors/infinoted.nix @@ -640,12 +641,13 @@ ./services/hardware/irqbalance.nix ./services/hardware/joycond.nix ./services/hardware/kanata.nix + ./services/hardware/keyd.nix ./services/hardware/kmonad.nix ./services/hardware/lcd.nix ./services/hardware/libinput.nix ./services/hardware/lirc.nix - ./services/hardware/nvidia-container-toolkit ./services/hardware/monado.nix + ./services/hardware/nvidia-container-toolkit ./services/hardware/nvidia-optimus.nix ./services/hardware/openrgb.nix ./services/hardware/pcscd.nix @@ -676,7 +678,6 @@ ./services/hardware/usbmuxd.nix ./services/hardware/usbrelayd.nix ./services/hardware/vdr.nix - ./services/hardware/keyd.nix ./services/home-automation/ebusd.nix ./services/home-automation/esphome.nix ./services/home-automation/evcc.nix @@ -688,9 +689,8 @@ ./services/home-automation/wyoming/piper.nix ./services/home-automation/wyoming/satellite.nix ./services/home-automation/zigbee2mqtt.nix - ./services/home-automation/zwave-js.nix ./services/home-automation/zwave-js-ui.nix - ./services/logging/SystemdJournal2Gelf.nix + ./services/home-automation/zwave-js.nix ./services/logging/awstats.nix ./services/logging/filebeat.nix ./services/logging/fluentd.nix @@ -707,8 +707,9 @@ ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix - ./services/logging/vector.nix + ./services/logging/SystemdJournal2Gelf.nix ./services/logging/ulogd.nix + ./services/logging/vector.nix ./services/mail/automx2.nix ./services/mail/clamsmtp.nix ./services/mail/cyrus-imap.nix @@ -738,8 +739,8 @@ ./services/mail/protonmail-bridge.nix ./services/mail/public-inbox.nix ./services/mail/roundcube.nix - ./services/mail/rspamd.nix ./services/mail/rspamd-trainer.nix + ./services/mail/rspamd.nix ./services/mail/rss2email.nix ./services/mail/schleuder.nix ./services/mail/spamassassin.nix @@ -762,8 +763,8 @@ ./services/matrix/mjolnir.nix ./services/matrix/mx-puppet-discord.nix ./services/matrix/pantalaimon.nix - ./services/matrix/synapse.nix ./services/matrix/synapse-auto-compressor.nix + ./services/matrix/synapse.nix ./services/misc/airsonic.nix ./services/misc/amazon-ssm-agent.nix ./services/misc/ananicy.nix @@ -886,8 +887,8 @@ ./services/misc/redlib.nix ./services/misc/redmine.nix ./services/misc/renovate.nix - ./services/misc/rmfakecloud.nix ./services/misc/rkvm.nix + ./services/misc/rmfakecloud.nix ./services/misc/rshim.nix ./services/misc/safeeyes.nix ./services/misc/sdrplay.nix @@ -915,14 +916,14 @@ ./services/misc/sysprof.nix ./services/misc/tabby.nix ./services/misc/tandoor-recipes.nix - ./services/misc/taskserver ./services/misc/taskchampion-sync-server.nix + ./services/misc/taskserver ./services/misc/tautulli.nix ./services/misc/tiddlywiki.nix ./services/misc/tp-auto-kbbl.nix + ./services/misc/transfer-sh.nix ./services/misc/turn-rs.nix ./services/misc/tuxclocker.nix - ./services/misc/transfer-sh.nix ./services/misc/tzupdate.nix ./services/misc/uhub.nix ./services/misc/wastebin.nix @@ -1025,11 +1026,11 @@ ./services/network-filesystems/drbd.nix ./services/network-filesystems/eris-server.nix ./services/network-filesystems/glusterfs.nix + ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/kbfs.nix ./services/network-filesystems/kubo.nix ./services/network-filesystems/litestream/default.nix ./services/network-filesystems/moosefs.nix - ./services/network-filesystems/ipfs-cluster.nix ./services/network-filesystems/netatalk.nix ./services/network-filesystems/nfsd.nix ./services/network-filesystems/openafs/client.nix @@ -1078,8 +1079,8 @@ ./services/networking/cjdns.nix ./services/networking/clatd.nix ./services/networking/cloudflare-dyndns.nix - ./services/networking/cloudflared.nix ./services/networking/cloudflare-warp.nix + ./services/networking/cloudflared.nix ./services/networking/cntlm.nix ./services/networking/connman.nix ./services/networking/consul.nix @@ -1091,9 +1092,9 @@ ./services/networking/croc.nix ./services/networking/dae.nix ./services/networking/dante.nix - ./services/networking/deconz.nix ./services/networking/ddclient.nix ./services/networking/ddns-updater.nix + ./services/networking/deconz.nix ./services/networking/dhcpcd.nix ./services/networking/dnscache.nix ./services/networking/dnscrypt-proxy2.nix @@ -1115,9 +1116,9 @@ ./services/networking/ferm.nix ./services/networking/firefox-syncserver.nix ./services/networking/fireqos.nix - ./services/networking/firewall.nix ./services/networking/firewall-iptables.nix ./services/networking/firewall-nftables.nix + ./services/networking/firewall.nix ./services/networking/firezone/gateway.nix ./services/networking/firezone/gui-client.nix ./services/networking/firezone/headless-client.nix @@ -1128,6 +1129,7 @@ ./services/networking/freeradius.nix ./services/networking/frp.nix ./services/networking/frr.nix + ./services/networking/g3proxy.nix ./services/networking/gateone.nix ./services/networking/gdomap.nix ./services/networking/ghostunnel.nix @@ -1140,12 +1142,12 @@ ./services/networking/go-neb.nix ./services/networking/go-shadowsocks2.nix ./services/networking/gobgpd.nix - ./services/networking/gokapi.nix ./services/networking/godns.nix + ./services/networking/gokapi.nix ./services/networking/gvpe.nix ./services/networking/hans.nix - ./services/networking/harmonia.nix ./services/networking/haproxy.nix + ./services/networking/harmonia.nix ./services/networking/headscale.nix ./services/networking/hickory-dns.nix ./services/networking/hostapd.nix @@ -1189,7 +1191,6 @@ ./services/networking/lxd-image-server.nix ./services/networking/magic-wormhole-mailbox-server.nix ./services/networking/matterbridge.nix - ./services/networking/mptcpd.nix ./services/networking/microsocks.nix ./services/networking/mihomo.nix ./services/networking/minidlna.nix @@ -1202,6 +1203,7 @@ ./services/networking/morty.nix ./services/networking/mosquitto.nix ./services/networking/mozillavpn.nix + ./services/networking/mptcpd.nix ./services/networking/mstpd.nix ./services/networking/mtprotoproxy.nix ./services/networking/mtr-exporter.nix @@ -1211,9 +1213,9 @@ ./services/networking/mycelium.nix ./services/networking/namecoind.nix ./services/networking/nar-serve.nix - ./services/networking/nat.nix ./services/networking/nat-iptables.nix ./services/networking/nat-nftables.nix + ./services/networking/nat.nix ./services/networking/nats.nix ./services/networking/nbd.nix ./services/networking/ncdns.nix @@ -1232,15 +1234,15 @@ ./services/networking/nix-serve.nix ./services/networking/nix-store-gcs-proxy.nix ./services/networking/nixops-dns.nix + ./services/networking/nm-file-secret-agent.nix ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix - ./services/networking/nm-file-secret-agent.nix ./services/networking/nomad.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntp/chrony.nix - ./services/networking/ntp/ntpd.nix ./services/networking/ntp/ntpd-rs.nix + ./services/networking/ntp/ntpd.nix ./services/networking/ntp/openntpd.nix ./services/networking/nullidentdmod.nix ./services/networking/nylon.nix @@ -1254,7 +1256,6 @@ ./services/networking/openvpn.nix ./services/networking/ostinato.nix ./services/networking/owamp.nix - ./services/networking/pyload.nix ./services/networking/pdns-recursor.nix ./services/networking/pdnsd.nix ./services/networking/peroxide.nix @@ -1267,6 +1268,7 @@ ./services/networking/pptpd.nix ./services/networking/privoxy.nix ./services/networking/prosody.nix + ./services/networking/pyload.nix ./services/networking/quassel.nix ./services/networking/quicktun.nix ./services/networking/quorum.nix @@ -1285,19 +1287,19 @@ ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix - ./services/networking/scion/scion.nix ./services/networking/scion/scion-control.nix ./services/networking/scion/scion-daemon.nix ./services/networking/scion/scion-dispatcher.nix - ./services/networking/scion/scion-router.nix ./services/networking/scion/scion-ip-gateway.nix + ./services/networking/scion/scion-router.nix + ./services/networking/scion/scion.nix ./services/networking/seafile.nix ./services/networking/searx.nix ./services/networking/shadowsocks.nix ./services/networking/shairport-sync.nix ./services/networking/shellhub-agent.nix - ./services/networking/shorewall.nix ./services/networking/shorewall6.nix + ./services/networking/shorewall.nix ./services/networking/sing-box.nix ./services/networking/sitespeed-io.nix ./services/networking/skydns.nix @@ -1311,7 +1313,6 @@ ./services/networking/spacecookie.nix ./services/networking/spiped.nix ./services/networking/squid.nix - ./services/networking/g3proxy.nix ./services/networking/ssh/sshd.nix ./services/networking/sslh.nix ./services/networking/strongswan-swanctl/module.nix @@ -1325,9 +1326,9 @@ ./services/networking/syncplay.nix ./services/networking/syncthing-relay.nix ./services/networking/syncthing.nix - ./services/networking/tailscale.nix ./services/networking/tailscale-auth.nix ./services/networking/tailscale-derper.nix + ./services/networking/tailscale.nix ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix @@ -1352,41 +1353,41 @@ ./services/networking/uptermd.nix ./services/networking/v2ray.nix ./services/networking/v2raya.nix - ./services/networking/veilid.nix ./services/networking/vdirsyncer.nix + ./services/networking/veilid.nix ./services/networking/vsftpd.nix ./services/networking/vwifi.nix ./services/networking/wasabibackend.nix + ./services/networking/webhook.nix ./services/networking/websockify.nix ./services/networking/wg-access-server.nix ./services/networking/wg-netmanager.nix - ./services/networking/whoogle-search.nix - ./services/networking/wvdial.nix - ./services/networking/webhook.nix ./services/networking/wg-quick.nix ./services/networking/wgautomesh.nix - ./services/networking/wireguard.nix + ./services/networking/whoogle-search.nix ./services/networking/wireguard-networkd.nix + ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix ./services/networking/wstunnel.nix + ./services/networking/wvdial.nix ./services/networking/x2goserver.nix ./services/networking/xandikos.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix ./services/networking/xray.nix ./services/networking/xrdp.nix + ./services/networking/yggdrasil-jumper.nix ./services/networking/yggdrasil.nix ./services/networking/zapret.nix - ./services/networking/yggdrasil-jumper.nix - ./services/networking/zerobin.nix ./services/networking/zenohd.nix + ./services/networking/zerobin.nix ./services/networking/zeronet.nix - ./services/networking/zerotierone.nix ./services/networking/zeronsd.nix + ./services/networking/zerotierone.nix ./services/networking/znc/default.nix + ./services/printing/cups-pdf.nix ./services/printing/cupsd.nix ./services/printing/ipp-usb.nix - ./services/printing/cups-pdf.nix ./services/scheduling/atd.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix @@ -1426,8 +1427,8 @@ ./services/security/kanidm.nix ./services/security/munge.nix ./services/security/nginx-sso.nix - ./services/security/oauth2-proxy.nix ./services/security/oauth2-proxy-nginx.nix + ./services/security/oauth2-proxy.nix ./services/security/openbao.nix ./services/security/opensnitch.nix ./services/security/paretosecurity.nix @@ -1444,8 +1445,8 @@ ./services/security/torify.nix ./services/security/torsocks.nix ./services/security/usbguard.nix - ./services/security/vault.nix ./services/security/vault-agent.nix + ./services/security/vault.nix ./services/security/vaultwarden/default.nix ./services/security/yubikey-agent.nix ./services/system/automatic-timezoned.nix @@ -1476,26 +1477,26 @@ ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix ./services/torrent/rtorrent.nix - ./services/torrent/transmission.nix ./services/torrent/torrentstream.nix + ./services/torrent/transmission.nix ./services/tracing/tempo.nix ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix ./services/video/epgstation/default.nix - ./services/video/go2rtc/default.nix ./services/video/frigate.nix + ./services/video/go2rtc/default.nix + ./services/video/mediamtx.nix ./services/video/mirakurun.nix ./services/video/photonvision.nix - ./services/video/mediamtx.nix ./services/video/ustreamer.nix ./services/video/v4l2-relayd.nix ./services/video/wivrn.nix ./services/wayland/cage.nix ./services/wayland/hypridle.nix ./services/web-apps/actual.nix - ./services/web-apps/akkoma.nix ./services/web-apps/agorakit.nix + ./services/web-apps/akkoma.nix ./services/web-apps/alps.nix ./services/web-apps/anuko-time-tracker.nix ./services/web-apps/archtika.nix @@ -1507,19 +1508,19 @@ ./services/web-apps/c2fmzq-server.nix ./services/web-apps/calibre-web.nix ./services/web-apps/castopod.nix - ./services/web-apps/coder.nix ./services/web-apps/changedetection-io.nix ./services/web-apps/chatgpt-retrieval-plugin.nix ./services/web-apps/cloudlog.nix ./services/web-apps/code-server.nix + ./services/web-apps/coder.nix ./services/web-apps/collabora-online.nix ./services/web-apps/commafeed.nix ./services/web-apps/convos.nix ./services/web-apps/cook-cli.nix ./services/web-apps/crabfit.nix - ./services/web-apps/davis.nix ./services/web-apps/cryptpad.nix ./services/web-apps/dashy.nix + ./services/web-apps/davis.nix ./services/web-apps/dependency-track.nix ./services/web-apps/dex.nix ./services/web-apps/discourse.nix @@ -1532,8 +1533,8 @@ ./services/web-apps/ethercalc.nix ./services/web-apps/fider.nix ./services/web-apps/filesender.nix - ./services/web-apps/firefly-iii.nix ./services/web-apps/firefly-iii-data-importer.nix + ./services/web-apps/firefly-iii.nix ./services/web-apps/flarum.nix ./services/web-apps/fluidd.nix ./services/web-apps/freshrss.nix @@ -1543,13 +1544,11 @@ ./services/web-apps/gerrit.nix ./services/web-apps/glance.nix ./services/web-apps/glitchtip.nix + ./services/web-apps/goatcounter.nix ./services/web-apps/gotify-server.nix ./services/web-apps/gotosocial.nix ./services/web-apps/grav.nix ./services/web-apps/grocy.nix - ./services/web-apps/part-db.nix - ./services/web-apps/pixelfed.nix - ./services/web-apps/goatcounter.nix ./services/web-apps/guacamole-client.nix ./services/web-apps/guacamole-server.nix ./services/web-apps/hatsu.nix @@ -1563,16 +1562,16 @@ ./services/web-apps/icingaweb2/icingaweb2.nix ./services/web-apps/icingaweb2/module-monitoring.nix ./services/web-apps/ifm.nix - ./services/web-apps/immich.nix ./services/web-apps/immich-public-proxy.nix + ./services/web-apps/immich.nix ./services/web-apps/invidious.nix ./services/web-apps/invoiceplane.nix ./services/web-apps/isso.nix ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/kanboard.nix ./services/web-apps/karakeep.nix ./services/web-apps/kasmweb/default.nix - ./services/web-apps/kanboard.nix ./services/web-apps/kavita.nix ./services/web-apps/keycloak.nix ./services/web-apps/kimai.nix @@ -1585,40 +1584,42 @@ ./services/web-apps/matomo.nix ./services/web-apps/mattermost.nix ./services/web-apps/mealie.nix + ./services/web-apps/mediagoblin.nix ./services/web-apps/mediawiki.nix ./services/web-apps/meme-bingo-web.nix ./services/web-apps/microbin.nix ./services/web-apps/miniflux.nix ./services/web-apps/misskey.nix + ./services/web-apps/mobilizon.nix ./services/web-apps/monica.nix ./services/web-apps/moodle.nix ./services/web-apps/movim.nix ./services/web-apps/netbox.nix - ./services/web-apps/nextcloud.nix ./services/web-apps/nextcloud-notify_push.nix ./services/web-apps/nextcloud-whiteboard-server.nix + ./services/web-apps/nextcloud.nix ./services/web-apps/nextjs-ollama-llm-ui.nix ./services/web-apps/nexus.nix ./services/web-apps/nifi.nix ./services/web-apps/node-red.nix ./services/web-apps/nostr-rs-relay.nix ./services/web-apps/ocis.nix - ./services/web-apps/onlyoffice.nix - ./services/web-apps/openvscode-server.nix - ./services/web-apps/mediagoblin.nix - ./services/web-apps/open-web-calendar.nix - ./services/web-apps/mobilizon.nix ./services/web-apps/olivetin.nix + ./services/web-apps/onlyoffice.nix + ./services/web-apps/open-web-calendar.nix + ./services/web-apps/openvscode-server.nix ./services/web-apps/openwebrx.nix ./services/web-apps/outline.nix + ./services/web-apps/part-db.nix ./services/web-apps/pds.nix ./services/web-apps/peering-manager.nix ./services/web-apps/peertube.nix ./services/web-apps/pgpkeyserver-lite.nix - ./services/web-apps/phylactery.nix ./services/web-apps/photoprism.nix + ./services/web-apps/phylactery.nix ./services/web-apps/pict-rs.nix ./services/web-apps/pingvin-share.nix + ./services/web-apps/pixelfed.nix ./services/web-apps/plantuml-server.nix ./services/web-apps/plausible.nix ./services/web-apps/porn-vault/default.nix @@ -1627,24 +1628,24 @@ ./services/web-apps/pretix.nix ./services/web-apps/privatebin.nix ./services/web-apps/prosody-filer.nix + ./services/web-apps/readeck.nix ./services/web-apps/reposilite.nix ./services/web-apps/rimgo.nix + ./services/web-apps/rss-bridge.nix ./services/web-apps/rutorrent.nix ./services/web-apps/screego.nix - ./services/web-apps/sftpgo.nix - ./services/web-apps/strfry.nix - ./services/web-apps/suwayomi-server.nix - ./services/web-apps/readeck.nix - ./services/web-apps/rss-bridge.nix ./services/web-apps/selfoss.nix + ./services/web-apps/sftpgo.nix ./services/web-apps/shiori.nix ./services/web-apps/silverbullet.nix ./services/web-apps/simplesamlphp.nix ./services/web-apps/slskd.nix ./services/web-apps/snipe-it.nix ./services/web-apps/sogo.nix - ./services/web-apps/stirling-pdf.nix ./services/web-apps/stash.nix + ./services/web-apps/stirling-pdf.nix + ./services/web-apps/strfry.nix + ./services/web-apps/suwayomi-server.nix ./services/web-apps/trilium.nix ./services/web-apps/tt-rss.nix ./services/web-apps/vikunja.nix @@ -1740,10 +1741,10 @@ ./services/x11/xserver.nix ./system/activation/activatable-system.nix ./system/activation/activation-script.nix + ./system/activation/bootspec.nix ./system/activation/pre-switch-check.nix ./system/activation/specialisation.nix ./system/activation/switchable-system.nix - ./system/activation/bootspec.nix ./system/activation/top-level.nix ./system/boot/binfmt.nix ./system/boot/clevis.nix @@ -1755,37 +1756,36 @@ ./system/boot/kernel.nix ./system/boot/kexec.nix ./system/boot/loader/efi.nix + ./system/boot/loader/external/external.nix ./system/boot/loader/generations-dir/generations-dir.nix ./system/boot/loader/generic-extlinux-compatible ./system/boot/loader/grub/grub.nix ./system/boot/loader/grub/ipxe.nix ./system/boot/loader/grub/memtest.nix - ./system/boot/loader/external/external.nix ./system/boot/loader/init-script/init-script.nix ./system/boot/loader/limine/limine.nix ./system/boot/loader/loader.nix ./system/boot/loader/systemd-boot/systemd-boot.nix ./system/boot/luksroot.nix - ./system/boot/stratisroot.nix ./system/boot/modprobe.nix ./system/boot/networkd.nix - ./system/boot/uki.nix - ./system/boot/unl0kr.nix ./system/boot/plymouth.nix ./system/boot/resolved.nix ./system/boot/shutdown.nix ./system/boot/stage-1.nix ./system/boot/stage-2.nix + ./system/boot/stratisroot.nix ./system/boot/systemd.nix ./system/boot/systemd/coredump.nix ./system/boot/systemd/dm-verity.nix ./system/boot/systemd/fido2.nix + ./system/boot/systemd/homed.nix ./system/boot/systemd/initrd-secrets.nix ./system/boot/systemd/initrd.nix - ./system/boot/systemd/journald.nix ./system/boot/systemd/journald-gateway.nix ./system/boot/systemd/journald-remote.nix ./system/boot/systemd/journald-upload.nix + ./system/boot/systemd/journald.nix ./system/boot/systemd/logind.nix ./system/boot/systemd/nspawn.nix ./system/boot/systemd/oomd.nix @@ -1797,9 +1797,10 @@ ./system/boot/systemd/tpm2.nix ./system/boot/systemd/user.nix ./system/boot/systemd/userdbd.nix - ./system/boot/systemd/homed.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix + ./system/boot/uki.nix + ./system/boot/unl0kr.nix ./system/boot/uvesafb.nix ./system/etc/etc-activation.nix ./tasks/auto-upgrade.nix @@ -1823,8 +1824,8 @@ ./tasks/filesystems/ntfs.nix ./tasks/filesystems/overlayfs.nix ./tasks/filesystems/reiserfs.nix - ./tasks/filesystems/sshfs.nix ./tasks/filesystems/squashfs.nix + ./tasks/filesystems/sshfs.nix ./tasks/filesystems/unionfs-fuse.nix ./tasks/filesystems/vboxsf.nix ./tasks/filesystems/vfat.nix @@ -1851,19 +1852,19 @@ ./virtualisation/docker.nix ./virtualisation/ecs-agent.nix ./virtualisation/hyperv-guest.nix - ./virtualisation/incus.nix ./virtualisation/incus-agent.nix + ./virtualisation/incus.nix ./virtualisation/kvmgt.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix ./virtualisation/lxcfs.nix - ./virtualisation/lxd.nix ./virtualisation/lxd-agent.nix + ./virtualisation/lxd.nix ./virtualisation/multipass.nix ./virtualisation/nixos-containers.nix ./virtualisation/oci-containers.nix - ./virtualisation/openstack-options.nix ./virtualisation/oci-options.nix + ./virtualisation/openstack-options.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix ./virtualisation/podman/default.nix @@ -1878,6 +1879,7 @@ ./virtualisation/waydroid.nix ./virtualisation/xe-guest-utilities.nix ./virtualisation/xen-dom0.nix + # keep-sorted end { documentation.nixos.extraModules = [ ./virtualisation/qemu-vm.nix diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index b0b64c8e8d24..0a0af6807be8 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -358,6 +358,14 @@ in description = "Settings to pass to the document exporter as CLI arguments."; }; }; + + configureTika = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to configure Tika and Gotenberg to process Office and e-mail files with OCR. + ''; + }; }; config = lib.mkIf cfg.enable ( @@ -378,12 +386,18 @@ in ]; }; - services.paperless.settings = lib.mkIf cfg.database.createLocally { - PAPERLESS_DBENGINE = "postgresql"; - PAPERLESS_DBHOST = "/run/postgresql"; - PAPERLESS_DBNAME = "paperless"; - PAPERLESS_DBUSER = "paperless"; - }; + services.paperless.settings = lib.mkMerge [ + (lib.mkIf cfg.database.createLocally { + PAPERLESS_DBENGINE = "postgresql"; + PAPERLESS_DBHOST = "/run/postgresql"; + PAPERLESS_DBNAME = "paperless"; + PAPERLESS_DBUSER = "paperless"; + }) + (lib.mkIf cfg.configureTika { + PAPERLESS_GOTENBERG_ENABLED = true; + PAPERLESS_TIKA_ENABLED = true; + }) + ]; systemd.slices.system-paperless = { description = "Paperless Document Management System Slice"; @@ -571,6 +585,18 @@ in gid = config.ids.gids.paperless; }; }; + + services.gotenberg = lib.mkIf cfg.configureTika { + enable = true; + # https://github.com/paperless-ngx/paperless-ngx/blob/v2.15.3/docker/compose/docker-compose.sqlite-tika.yml#L64-L69 + chromium.disableJavascript = true; + extraArgs = [ "--chromium-allow-list=file:///tmp/.*" ]; + }; + + services.tika = lib.mkIf cfg.configureTika { + enable = true; + enableOcr = true; + }; } (lib.mkIf cfg.exporter.enable { diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 162d9ce679be..fc65c07e5dfa 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -292,7 +292,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PermissionsStartOnly = true; @@ -319,7 +319,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile = "/run/${name}/${name}.pid"; @@ -340,7 +340,7 @@ in serviceConfig = { Slice = "system-graphite.slice"; RuntimeDirectory = name; - ExecStart = "${pkgs.python3Packages.twisted}/bin/twistd ${carbonOpts name}"; + ExecStart = "${lib.getExe' pkgs.python3Packages.twisted "twistd"} ${carbonOpts name}"; User = "graphite"; Group = "graphite"; PIDFile = "/run/${name}/${name}.pid"; @@ -384,7 +384,7 @@ in }; serviceConfig = { ExecStart = '' - ${pkgs.python3Packages.waitress-django}/bin/waitress-serve-django \ + ${lib.getExe pkgs.python3Packages.waitress-django} \ --host=${cfg.web.listenAddress} --port=${toString cfg.web.port} ''; User = "graphite"; @@ -397,7 +397,7 @@ in mkdir -p ${dataDir}/{whisper/,log/webapp/} chmod 0700 ${dataDir}/{whisper/,log/webapp/} - ${pkgs.python3Packages.django}/bin/django-admin.py migrate --noinput + ${lib.getExe' pkgs.python3Packages.django "django-admin"} migrate --noinput chown -R graphite:graphite ${dataDir} @@ -407,7 +407,7 @@ in # Only collect static files when graphite_web changes. if ! [ "${dataDir}/current_graphite_web" -ef "${pkgs.python3Packages.graphite-web}" ]; then mkdir -p ${staticDir} - ${pkgs.python3Packages.django}/bin/django-admin.py collectstatic --noinput --clear + ${lib.getExe' pkgs.python3Packages.django "django-admin"} collectstatic --noinput --clear chown -R graphite:graphite ${staticDir} ln -sfT "${pkgs.python3Packages.graphite-web}" "${dataDir}/current_graphite_web" fi @@ -427,7 +427,7 @@ in ]; environment = seyrenConfig; serviceConfig = { - ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; + ExecStart = "${lib.getExe pkgs.seyren} -httpPort ${toString cfg.seyren.port}"; WorkingDirectory = dataDir; User = "graphite"; Group = "graphite"; diff --git a/pkgs/applications/audio/ardour/7.nix b/pkgs/applications/audio/ardour/7.nix index 0830ff4ddf54..45c6b132d59b 100644 --- a/pkgs/applications/audio/ardour/7.nix +++ b/pkgs/applications/audio/ardour/7.nix @@ -7,7 +7,7 @@ fetchpatch2, alsa-lib, aubio, - boost, + boost186, cairomm, cppunit, curl, @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { [ alsa-lib aubio - boost + boost186 cairomm cppunit curl diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index c9af8689d866..90531ba32cb2 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -5593,6 +5593,8 @@ let }; }; + yy0931.vscode-sqlite3-editor = callPackage ./yy0931.vscode-sqlite3-editor { }; + yzane.markdown-pdf = callPackage ./yzane.markdown-pdf { }; yzhang.dictionary-completion = buildVscodeMarketplaceExtension { diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix new file mode 100644 index 000000000000..bb3d0be663ad --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix @@ -0,0 +1,20 @@ +{ + lib, + vscode-utils, +}: +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-sqlite3-editor"; + publisher = "yy0931"; + version = "1.0.207"; + hash = "sha256-HToO43MnqJlWcKx4O5C0b7RXyeKY5PzxMY5/3cNOtgE="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog"; + description = "SQLite3 Editor for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=yy0931.vscode-sqlite3-editor"; + homepage = "https://github.com/yy0931/sqlite3-editor"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.ch4og ]; + }; +} diff --git a/pkgs/applications/science/electronics/degate/default.nix b/pkgs/applications/science/electronics/degate/default.nix index 5e328890d48d..eb239685d008 100644 --- a/pkgs/applications/science/electronics/degate/default.nix +++ b/pkgs/applications/science/electronics/degate/default.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchpatch, cmake, - boost, + boost183, qtbase, qtimageformats, qttools, @@ -12,7 +12,7 @@ }: let - boost_static = boost.override { enableStatic = true; }; + boost_static = boost183.override { enableStatic = true; }; in stdenv.mkDerivation rec { diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 98ddc17e5589..88f29a6f718c 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -48,8 +48,8 @@ mkDerivation rec { src = fetchFromGitHub { owner = "MythTV"; repo = "mythtv"; - rev = "v${version}"; - hash = "sha256-ZhVlDX5I6SJEntVg30Iy/XxgsorDjFycAt2uksJMJps="; + tag = "v${version}"; + hash = "sha256-4mWtPJi2CBoek8LWEfdFxe1ybomAOCTWBTKExMm7nLU="; }; patches = [ diff --git a/pkgs/by-name/ac/action-validator/package.nix b/pkgs/by-name/ac/action-validator/package.nix index 8eb5e3aaf86b..df8b6c2fec76 100644 --- a/pkgs/by-name/ac/action-validator/package.nix +++ b/pkgs/by-name/ac/action-validator/package.nix @@ -2,22 +2,28 @@ lib, rustPlatform, fetchFromGitHub, + unstableGitUpdater, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage { pname = "action-validator"; - version = "0.6.0"; + version = "0.6.0-unstable-2025-02-16"; src = fetchFromGitHub { owner = "mpalmer"; repo = "action-validator"; - rev = "v${version}"; - hash = "sha256-lJHGx/GFddIwVVXRj75Z/l5CH/yuw/uIhr02Qkjruww="; + rev = "2f8be1d2066eb3687496a156d00b4f1b3ea7b028"; + hash = "sha256-QDnikgAfkrvn7/vnmgTQ5J8Ro2HZ6SVkp9cPUYgejqM="; fetchSubmodules = true; }; useFetchCargoVendor = true; - cargoHash = "sha256-dy66ZkU9lIYGe9T3oR8m5cGcBQO5MF1KsLjfaHTtvlY="; + cargoHash = "sha256-FuJ5NzeZhfN312wK5Q1DgIXUAN6hqxu/1BhGqasbdS8="; + + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + branch = "main"; + }; meta = with lib; { description = "Tool to validate GitHub Action and Workflow YAML files"; diff --git a/pkgs/by-name/ag/age-plugin-1p/package.nix b/pkgs/by-name/ag/age-plugin-1p/package.nix new file mode 100644 index 000000000000..453c3752cbdf --- /dev/null +++ b/pkgs/by-name/ag/age-plugin-1p/package.nix @@ -0,0 +1,33 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: + +buildGoModule rec { + pname = "age-plugin-1p"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "Enzime"; + repo = "age-plugin-1p"; + tag = "v${version}"; + hash = "sha256-QYHHD7wOgRxRVkUOjwMz5DV8oxlb9mmb2K4HPoISguU="; + }; + + vendorHash = "sha256-WrdwhlaqciVEB2L+Dh/LEeSE7I3+PsOTW4c+0yOKzKY="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Use SSH keys from 1Password with age"; + mainProgram = "age-plugin-1p"; + homepage = "https://github.com/Enzime/age-plugin-1p"; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/by-name/ag/age/package.nix b/pkgs/by-name/ag/age/package.nix index bccae445b5ca..0a0c0a43eed9 100644 --- a/pkgs/by-name/ag/age/package.nix +++ b/pkgs/by-name/ag/age/package.nix @@ -3,12 +3,13 @@ buildGoModule, fetchFromGitHub, installShellFiles, - age-plugin-tpm, + age-plugin-fido2-hmac, + age-plugin-ledger, age-plugin-se, age-plugin-sss, - age-plugin-ledger, + age-plugin-tpm, age-plugin-yubikey, - age-plugin-fido2-hmac, + age-plugin-1p, makeWrapper, runCommand, }: @@ -59,12 +60,13 @@ buildGoModule (final: { # group age plugins together passthru.plugins = { inherit - age-plugin-tpm + age-plugin-fido2-hmac + age-plugin-ledger age-plugin-se age-plugin-sss - age-plugin-ledger + age-plugin-tpm age-plugin-yubikey - age-plugin-fido2-hmac + age-plugin-1p ; }; diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix index 9a71936c00a3..e0a21953d456 100644 --- a/pkgs/by-name/ar/artisan/package.nix +++ b/pkgs/by-name/ar/artisan/package.nix @@ -2,14 +2,15 @@ lib, appimageTools, fetchurl, + nix-update-script, }: let pname = "artisan"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage"; - hash = "sha256-HwzTxuE7aRuXrI7BbySFgYGu74uw3JyBs91iPNGT2Jg="; + hash = "sha256-GU9DCAIMioPRUC1IDu8SbhD802pWEH7MlALnQH+Y4oU="; }; appimageContents = appimageTools.extract { @@ -24,6 +25,10 @@ appimageTools.wrapType2 { install -m 444 -D ${appimageContents}/artisan.png $out/share/applications/artisan.png ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=v([\\d.]+)" ]; + }; + meta = { description = "visual scope for coffee roasters"; homepage = "https://artisan-scope.org/"; diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index be5509883db8..efdbfd342a7d 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -25,14 +25,14 @@ in python.pkgs.buildPythonApplication rec { pname = "awsebcli"; - version = "3.23.2"; + version = "3.23.3"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = version; - hash = "sha256-nZP3eepp3hUT2hCxz75vTP1N2akOZPQhyFRN6ecJvU4="; + hash = "sha256-Jaj90NRCwaxRQQlB4s4Us+liYiNohpwRsHuvKM5WmbU="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix new file mode 100644 index 000000000000..6c4fa885f51d --- /dev/null +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -0,0 +1,51 @@ +{ + fetchFromGitHub, + lib, + nix-update-script, + openssl, + pkg-config, + rustPlatform, + writableTmpDirAsHomeHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cargo-seek"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "tareqimbasher"; + repo = "cargo-seek"; + tag = "v${finalAttrs.version}"; + hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14="; + }; + + cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ writableTmpDirAsHomeHook ]; + # We cannot use `versionCheckHook` here since access to the $HOME directory is required. + installCheckPhase = '' + runHook preInstallCheck + $out/bin/cargo-seek --version | grep "${finalAttrs.version}" + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal user interface for searching, adding and installing cargo crates"; + homepage = "https://github.com/tareqimbasher/cargo-seek"; + changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ qwqawawow ]; + mainProgram = "cargo-seek"; + }; +}) diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix index 02e0648ee688..042177ed5366 100644 --- a/pkgs/by-name/cl/clusternet/package.nix +++ b/pkgs/by-name/cl/clusternet/package.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, - buildGoModule, + buildGo123Module, }: -buildGoModule rec { +buildGo123Module rec { pname = "clusternet"; version = "0.17.3"; diff --git a/pkgs/by-name/cp/cpu_features/package.nix b/pkgs/by-name/cp/cpu_features/package.nix index 2e0c26314192..3e0786ea1659 100644 --- a/pkgs/by-name/cp/cpu_features/package.nix +++ b/pkgs/by-name/cp/cpu_features/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "cpu_features"; - version = "0.9.0"; + version = "0.10.0"; outputs = [ "out" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { owner = "google"; repo = "cpu_features"; rev = "v${version}"; - hash = "sha256-uXN5crzgobNGlLpbpuOxR+9QVtZKrWhxC/UjQEakJwk="; + hash = "sha256-YnNcNzlFVTHKCxfmhTDhOxluxK2VCBuEi7VZGgUB4VU="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/el/element-call/missing-hashes.json b/pkgs/by-name/el/element-call/missing-hashes.json new file mode 100644 index 000000000000..9b6751d6b314 --- /dev/null +++ b/pkgs/by-name/el/element-call/missing-hashes.json @@ -0,0 +1,67 @@ +{ + "@esbuild/aix-ppc64@npm:0.25.1": "6de3a364b7f79f21f66d606d4d29c72ef81c741d71ab4bb941c4eabe7b6a809b1340f4dd5c943827005e421912880741320b9617d17fce762d204cfb94175223", + "@esbuild/android-arm64@npm:0.25.1": "716c98ad3220c71cbaedcfa34aa7c877a3fae911938c3776a66600d7f65980e384799a6832a1b9aea96c6d5a8880610f54744bd0813e743c511d44056ef528d6", + "@esbuild/android-arm@npm:0.25.1": "d2c9e95dd2027f6e14250a90a11136d9ce73a2157a8d104df4a9dd199d3c50cd91f25813536b4776630acb78596bd5a025976962c6d624df7594c32f2d9c1395", + "@esbuild/android-x64@npm:0.25.1": "92f1bec801b414ecdc4b73adfbb4482f4f2cfba423d33296914fa59ffdafb81facc445a7f65d1eea813c078220a0606f4be02252843bb9039ceb2755f643387c", + "@esbuild/darwin-arm64@npm:0.25.1": "9c4cd09c0bd8479e27e04e2397edccebae928184c463684490137d2b7ea3171051b66596db229af2ad3e6a911c1c8a9d10b8aed30d11d0aa155ac0d309fd5dd6", + "@esbuild/darwin-x64@npm:0.25.1": "31b64c02be9438e175e8b343c52e0bbc7964f08a1b44e0adbfa2a1b229ccd0ad0184cdb8313272b4590298833ea0b197d82a909466caffe90105f8acb30402d0", + "@esbuild/freebsd-arm64@npm:0.25.1": "e04018ffd760dd101a5931e0248751bdfca98e3f29be9b41051d55278907f52a3e5ab80c32168e208c2ff287510d6d5b765d3adc841bfd621af7930c10a547e6", + "@esbuild/freebsd-x64@npm:0.25.1": "438215bea2dc716d2c9ffe9b921bbde06e77d96ec0c837fd79f46bc6e195aa50e5f55490228f7433df7aa47810eec5c602a9d9cf956c1794778018632b196f34", + "@esbuild/linux-arm64@npm:0.25.1": "c839788b6db471f144bc2627a117083c9a50402c76cde2f0e5411faaeb3a5cde4972bb7336b87de67cd0a65d4d5b00759668407a03b5d4ed3130d4984837429a", + "@esbuild/linux-arm@npm:0.25.1": "ecf9fd9028d2166619b9a45161a987eebb6ef3dcb0159a2607ab164c58c26a15cf274e0b1088834c07ef9166349276d595fdad5c42bce8d03a55cb213d947efa", + "@esbuild/linux-ia32@npm:0.25.1": "36f208e10a4b778a28a9002338872e52d24dfc18e25d3b41dc53892279c3ee842d76c7b608a30620f128d85344acac0dc86f203f5de7082a21fa2e908c96b68c", + "@esbuild/linux-loong64@npm:0.25.1": "75d95e6ee995c9f2abb202ca430685e5d58fbe9b0b5b01a69b498c9b360d309026d15bae7831de9c0c4f02e45028a92ffb169117c3b56dd1ac7ea8c6ef50628d", + "@esbuild/linux-mips64el@npm:0.25.1": "7fc22eb8a7dc9ee743113cb327eef3591bced4753f416f8dd722794a198a053ab6e120b3b13c1bb6cc89cbd02ea502187b1a3c9ebe8187407665c78995153740", + "@esbuild/linux-ppc64@npm:0.25.1": "84f914a776774bf209c5f96a3708e52477e1966b689a880c0256530063bc581125b5cc04b9700f4aa892e7770ba47c5a950a4be9f1bb3ccbe60a500383602156", + "@esbuild/linux-riscv64@npm:0.25.1": "97f47cd5695686254b58f950ca973df1fcecfebf3bd585629121a65323ffaa7f95cf821392011ee069da492b46fdff771be332c699a438cf123351610e12d621", + "@esbuild/linux-s390x@npm:0.25.1": "10760a999d432d092a8ebe5f09752ee7e8ea77a1afa5f1adfe7f9ccb5bbf77d6e0da6dce5d1a4a7cd731d89b6075723c2bc0328f446ed129c4b63c6441ba22ae", + "@esbuild/linux-x64@npm:0.25.1": "4cdb1625726580eb42432878912d5480a0321559ef2c6425c1db55f89f3fe1c35fb03b3adec92c3f52a4db751d7535f23086b80ed7b219d1edbb254ffbe96e68", + "@esbuild/netbsd-arm64@npm:0.25.1": "f2427b094e072d2db7944b1d2a988dd9f17627976a395b941f225aec2d0565da2ea110a845eafae960af08e3eea74eb327e5eb9dbe06dc1e14f4439596c3b47c", + "@esbuild/netbsd-x64@npm:0.25.1": "c8347ecc18b175923a3cbdaef61b64815ffe0cf2cc285f4034337c2df83e78a118ebfdf2ac3a46a8d8a19ce6a0e0605d27d11570d1758ab90074c99047b82fc0", + "@esbuild/openbsd-arm64@npm:0.25.1": "719812786b4f3ab4471a306c930ab1bf31e9d92f933ea2a34566f07d6269df5058e7d48408127daa197e6fdb21e30697303127d259b76b18936d534619a3eb15", + "@esbuild/openbsd-x64@npm:0.25.1": "21590cbeda028e9b9f8131c54c36bab65a5d5bd5dd4e6bd9f80438045a655e9ac634bb3535a8650b694db267fe23bd2318a59cdec2fae1ba389ed1a00cc0bbe7", + "@esbuild/sunos-x64@npm:0.25.1": "e20ce3891d8717fe2cb885d92d16e9409802316eaa91071be5c7d75164d23dbc5a502be3691039051843d94192e8cf43ade61014a8bce298cfc13a8d3ddd85b0", + "@esbuild/win32-arm64@npm:0.25.1": "749a211eae6a47e5ceb71898df668d083bdec2ed762116fea7772824281f793aceb0487946e20ff604d7e102d1fc8538a73f15b476ca36e07f7ddfb601f6dfa1", + "@esbuild/win32-ia32@npm:0.25.1": "bb45fd889d858678ec68114bfc398965ed8d44e46a9517fcd9f7b397101c2cf94d78938a2640f6f2a1fe65de4ae8830fd426cd21a28302bb92333913b3c16c85", + "@esbuild/win32-x64@npm:0.25.1": "e33291b9834095e6460bd20bb15c49361758bf66d28ccffe0c06a1565211c91f668d9cfc0cbd5bd7a5def693fe7272dbe290b08d4eadba29e750c8a9c739f564", + "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a", + "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79", + "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b", + "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750", + "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144", + "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1", + "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e", + "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0", + "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690", + "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d", + "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628", + "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c", + "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963", + "@rollup/rollup-android-arm-eabi@npm:4.37.0": "137cc44b5452772bc857f3a9b113dc89a95b0d529963e91a49ac1b336302f37931da052a5d07c294da6060d07251c0251c7d363fd2be1775b59afd84a4c2ec67", + "@rollup/rollup-android-arm64@npm:4.37.0": "a6856efb422e0e9ab62f407e0e73908fe78d42fbb2730aeeba3d8b3f034449ef248a0fb596b5af3e87f7054e00328aa4322525a375508f492dbc7c2478aa0e49", + "@rollup/rollup-darwin-arm64@npm:4.37.0": "ac29a2a8eb0e40c54a1685c868436658682293cacde10b7cbf587845902e4e95ec4b84e4eefbf7ac6a4b6330b47fe4094dbeeb90f22c0ee130ff984b8d3a1cb9", + "@rollup/rollup-darwin-x64@npm:4.37.0": "037115d7f3b9ceab60df8ea12a48762a6c4051da7008a6b5d47174d9980759c392d7c6e4e79e2989744f0a16d1fb78ae97a9abd309fb1c41b07b65fab1700338", + "@rollup/rollup-freebsd-arm64@npm:4.37.0": "8ac2a91f628962633cf33aa462e567b1fc09b4ea09bf7a882ebb7ebf7adf4530d5f9d1b2dfa50ef64ddfa4b820e1eea324041f4c847298ddbe48d7491a944016", + "@rollup/rollup-freebsd-x64@npm:4.37.0": "855b528e935ad21de0297112b2b73ea4ca7db94278606811f2d61011cf8f8042e4b7127f7993859320876fba585a00c5e7e11c7b50ce23af4ccca3679a69754f", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.37.0": "dc126fb662d1a645ab41680033a987908ed0565b4ea9d414a9a46a61c06e9b136c010d1f28b1c34ffb101375a5279f18ee70d0d9b4ff1f2db80a54a05af3071d", + "@rollup/rollup-linux-arm-musleabihf@npm:4.37.0": "206cf3b319948b5d2d5ada18c698f16350c4cb64b53ad754fad91c1fe403c5fc110b3d3d2436433c5fd9ed1e1cec3535ed184902a6986f8bc0ae9770360e3c0b", + "@rollup/rollup-linux-arm64-gnu@npm:4.37.0": "f96da93f09aad5145f6fcfd69eccb6a2d407754e13f168d161dd2280991b7e4a3a514009b8a796767e5bd85ca0e4f81e2aea19781bb027d3ec59cf01768e2e1c", + "@rollup/rollup-linux-arm64-musl@npm:4.37.0": "c31f0c0aeefd18b59212f845aacac5a5a614ce0101db27dcc53884ae4d4e766d399d816104a10f4ee8c4c28e2045abb2d6a778c00bd30a430b3f34be4445cb1c", + "@rollup/rollup-linux-loongarch64-gnu@npm:4.37.0": "d69b456caaa8c12c2936a6836dc2dd3b9169ebfc2d888c904d3407fb2c53ba99a3323bfd36d447c17ff0b9e31b4709defaf72cafb32c23c773fbffdee50bc7fc", + "@rollup/rollup-linux-powerpc64le-gnu@npm:4.37.0": "abc5b4e7960965f01948dbf7e956695643cf6ab78ef1d14f2bc34b93cbb85a9ccb9c005dfbf948a80145cd808078a34d216c9d4e801570e2ca638a563ecd0ae2", + "@rollup/rollup-linux-riscv64-gnu@npm:4.37.0": "a9a5fe6a24955dae476c9ab5fb22d5f807e0ff916ff1ec289c8050e6688695e9c434dfdb130282712dd3657bf883af4544ed1ebc77b68530ccb8e33af484a41e", + "@rollup/rollup-linux-riscv64-musl@npm:4.37.0": "e6cd70f709a59037f496d1086f34148ef2ba92bbf1813e07ccd52b3643822486fa95671a6ed4a3397b9ef23e3a4dea20926f9e1a26b00a06173202627cf2f0ce", + "@rollup/rollup-linux-s390x-gnu@npm:4.37.0": "a6704bd605db0a99a60947a6a69ad6d1dbf712f57d4bcaba24a122cc062b2513319726e8211410d5d9d2bc1face3b153c45c4c9209ead6a25f87cf6e79828864", + "@rollup/rollup-linux-x64-gnu@npm:4.37.0": "fb0ee05c300d73fb05e5584418c41cd616aca8ccb4c4397b56ada769b4e3655223cdea2ce136c3ff3ed3efb9f74800acbd4801135afc3fbd49b29fff092ebd8c", + "@rollup/rollup-linux-x64-musl@npm:4.37.0": "c502057b9ef77bb43df6337eb02c5bbb8f7aabb2780f3de8256048ade427d319e4d5cca4e4238c3076ddddfd9749d9854e8fbc7f6e50cec84e778da6dafe90b7", + "@rollup/rollup-win32-arm64-msvc@npm:4.37.0": "4a6a5c2fb0c520edd3f67deb773ff600698a665ac5a4ba4ac8147836aa054be0f3fab54c841f3eef2b638224dd432a62b5f48b3704f5d3dd37ec7fcfc6a70591", + "@rollup/rollup-win32-ia32-msvc@npm:4.37.0": "439f4339c26c104333b3f55a34ef1a2280b22eec165362eee1816548a0b93f0440a6e3982af9263d1a4158d665a6ecba68c64bf12a786eae69db232399598321", + "@rollup/rollup-win32-x64-msvc@npm:4.37.0": "0c85f06fddfc73dd4457a6c6ec841e52d0fb81179fe63754bd3c02c4795ec338685bd14ff49672ddfb3767aecf4f01f4a5da5730b0cf62be318753390027de37", + "@sentry/cli-darwin@npm:2.42.2": "3df1b8774a2dffba2a413420b573d0ddb94a51ab530cfcf719736cac37fb9b6ff835516b4b783771f003659436a00d3ee5ea201fb2510c1ea517d7256c619b50", + "@sentry/cli-linux-arm64@npm:2.42.2": "17ab90626910c137925aa307bfb4b2f5790a756eaec9bbfa1066b1c2265ec1981ae3d7c8b2014071da9dd3a604cf150ba9a8d93a16e0da155831c7c8a524f956", + "@sentry/cli-linux-arm@npm:2.42.2": "2d31e7d2603f124e2a36626e91dd8c50a0eba27386b94a7076115022e50193140d7f613850adf64740ee46102cec99845750df05430dd16ea50f01607ead6d2d", + "@sentry/cli-linux-i686@npm:2.42.2": "e5c52d65f507393c786373aaff873d6522f9ab26ef3cea498268ef63d053dc9f4e806c3295c22b48c5dd1f7ecf0c47bfaa0f7545424ef81a3cd51914de2af2bc", + "@sentry/cli-linux-x64@npm:2.42.2": "62ed35b355b7673c8cc1d1542c21d1fb908022c2cc951eda47ee4a55c3e53499c1eca08b93408b547adf9ffe7bcb6d43efa50f185f6fa66155a13373ea79d5f3", + "@sentry/cli-win32-i686@npm:2.42.2": "3876d8d3f6139d984714ed5fed8ef124d32af8f5d7cd6968adc8e910727e12eb39d85dcc6304a5e249dce7d8e93e11f8bcfde83545835d959f260bf4b1914d00", + "@sentry/cli-win32-x64@npm:2.42.2": "16e6deb7f0faaed1a88c121463b3ef727726351ec04afe3308ff3775d26e1d7b990a3fd65b216d7fc2ac4f6967c625f14e6dbc2dab99fcc9d7a625ec80422ab8" +} diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index d2da74943ee1..7857d8741af9 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -3,33 +3,60 @@ stdenv, fetchFromGitHub, fetchYarnDeps, + git, + yarn-berry, yarnConfigHook, - yarnBuildHook, nodejs, }: stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-BugR5aXDxIQ9WOhaqXEoo0FdZHnYSvoqDoRJLDd4PUk="; + hash = "sha256-hKlzp6dDYRp1fM6soho84nP0phkQkaGJEGUf0MqzQGc="; }; - offlineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-7dUSt1k/5N6BaYrT272J6xxDGgloAsDw1dCFh327Itc="; + matrixJsSdkRevision = "19b1b901f575755d29d1fe03ca48cbf7c1cae05c"; + matrixJsSdkOfflineCache = fetchYarnDeps { + yarnLock = "${finalAttrs.offlineCache}/checkouts/${finalAttrs.matrixJsSdkRevision}/yarn.lock"; + hash = "sha256-pi2MW+58DCkHJDOxMWeXzF+v+5JhJFGQcUgsRsYjNvw="; + }; + + dontYarnInstallDeps = true; + preConfigure = '' + cp -r $offlineCache writable + chmod u+w -R writable + pushd writable/checkouts/${finalAttrs.matrixJsSdkRevision}/ + mkdir -p .git/{refs,objects} + echo ${finalAttrs.matrixJsSdkRevision} > .git/HEAD + SKIP_YARN_COREPACK_CHECK=1 offlineCache=$matrixJsSdkOfflineCache yarnConfigHook + popd + offlineCache=writable + ''; + + missingHashes = ./missing-hashes.json; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-Pv9ioa6F5gNx+8oMJvvRI/LTJGJ4ALrIQFvoH++szuo="; }; nativeBuildInputs = [ + git + yarn-berry.yarnBerryConfigHook yarnConfigHook - yarnBuildHook nodejs ]; + buildPhase = '' + runHook preBuild + ${lib.getExe yarn-berry} build + runHook postBuild + ''; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index 31e23a2d044f..3a852dcccb5c 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ferron"; - version = "1.0.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "ferronweb"; repo = "ferron"; tag = finalAttrs.version; - hash = "sha256-kw2Ffl5KB3urg5h/ejbW+WxYLpNrxIjPy0levZPgRoo="; + hash = "sha256-FK3LdDkTtY5UsYc/wR8cAyh2GHs9oTvN2K3N0tn+eOM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-uPzEz72/3huigY8moYX5ztRZ0Uaye+GN7V8vKKklPkY="; + cargoHash = "sha256-/OhIsP3okvCVwGP0Txjm8feOumaJXxoJdCY/CE0Tu6Y="; nativeBuildInputs = [ pkg-config @@ -47,6 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast, memory-safe web server written in Rust"; homepage = "https://github.com/ferronweb/ferron"; + changelog = "https://github.com/ferronweb/ferron/releases/tag/${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "ferron"; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index fd3006933239..07a0c4686e1f 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.15.37"; + version = "3.15.38"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${version}"; - hash = "sha256-g/RFU2HT4SjiexbfBFkYp7N3qqvoBxJiIwxZQ3+//5s="; + hash = "sha256-quEqpF5oj1FLmQrIS4t3HwS23/m/QH/ZVijlQapt5Mc="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fo/folio/package.nix b/pkgs/by-name/fo/folio/package.nix index 313d9ef3749e..ea9d78ac61f8 100644 --- a/pkgs/by-name/fo/folio/package.nix +++ b/pkgs/by-name/fo/folio/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "folio"; - version = "25.01"; + version = "25.02"; src = fetchFromGitHub { owner = "toolstack"; repo = "Folio"; tag = version; - hash = "sha256-EfZMHoF6xyRaxrLDLkBb07fvUxSQFDFViQJ2y68YhZg="; + hash = "sha256-u7HieTsbSohCjpLNyeY/ZZdmpQWulZaCkxOV5a5QyBY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix index 164d97538163..c31929fb7e62 100644 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -1,8 +1,8 @@ import ./generic.nix { - version = "11.0.0"; - hash = "sha256-j/SmfWFfYDApqGXcH/gRF6c7gUCTkLYFTglgtdq9u/U="; + version = "11.0.1"; + hash = "sha256-hsJfJOJ6mTIGGV+0YwSA9SYsLXxI1VTXzc+SyXJJ69Q="; npmDepsHash = "sha256-laHHXq59/7+rJSYTD1Aq/AvFcio6vsnWkeV8enq3yTg="; - vendorHash = "sha256-REHrSuvAB5fbJ1WR+rggGZUSMy0FWnAkQQbTIqN2K2E="; + vendorHash = "sha256-8fa6l89+6NhVsi6VuTvQs35E3HuiBFxM8NUQ/jzlzV0="; lts = true; nixUpdateExtraArgs = [ "--override-filename" diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index c507512dd9f5..05690ae7be12 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -292,6 +292,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isDarwin [ # flaky on macos "test_rda_download_queue" + # https://github.com/OSGeo/gdal/commit/fa0ac7544af837613e9831d4d2841dd6bf735e1f + "test_ogr_gpkg_arrow_stream_huge_array" ] ++ lib.optionals (lib.versionOlder proj.version "8") [ "test_ogr_parquet_write_crs_without_id_in_datum_ensemble_members" diff --git a/pkgs/by-name/gi/git-mit/libgit2-update.patch b/pkgs/by-name/gi/git-mit/libgit2-update.patch new file mode 100644 index 000000000000..604636dacd97 --- /dev/null +++ b/pkgs/by-name/gi/git-mit/libgit2-update.patch @@ -0,0 +1,163 @@ +From 3e82a4f5017972c7d28151a468bb71fe7d2279e0 Mon Sep 17 00:00:00 2001 +From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> +Date: Mon, 13 Jan 2025 01:45:12 +0000 +Subject: [PATCH] fix(deps): update rust crate git2 to 0.20.0 + +--- + Cargo.lock | 8 ++++---- + git-mit-config/Cargo.toml | 2 +- + git-mit-install/Cargo.toml | 2 +- + git-mit-relates-to/Cargo.toml | 2 +- + git-mit/Cargo.toml | 2 +- + mit-commit-message-lints/Cargo.toml | 2 +- + mit-commit-msg/Cargo.toml | 2 +- + mit-hook-test-helper/Cargo.toml | 2 +- + mit-pre-commit/Cargo.toml | 2 +- + mit-prepare-commit-msg/Cargo.toml | 2 +- + 10 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 11c858e8..db9e01dd 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -783,9 +783,9 @@ dependencies = [ + + [[package]] + name = "git2" +-version = "0.19.0" ++version = "0.20.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724" ++checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff" + dependencies = [ + "bitflags 2.7.0", + "libc", +@@ -1075,9 +1075,9 @@ checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + + [[package]] + name = "libgit2-sys" +-version = "0.17.0+1.8.1" ++version = "0.18.0+1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224" ++checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec" + dependencies = [ + "cc", + "libc", +diff --git a/git-mit-config/Cargo.toml b/git-mit-config/Cargo.toml +index aa1fd61e..3ec0cd93 100644 +--- a/git-mit-config/Cargo.toml ++++ b/git-mit-config/Cargo.toml +@@ -15,7 +15,7 @@ mit-lint = "3.2.9" + shell-words = "1.1.0" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +diff --git a/git-mit-install/Cargo.toml b/git-mit-install/Cargo.toml +index a7611272..96f58672 100644 +--- a/git-mit-install/Cargo.toml ++++ b/git-mit-install/Cargo.toml +@@ -18,7 +18,7 @@ clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } + + +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + indoc = "2.0.5" +diff --git a/git-mit-relates-to/Cargo.toml b/git-mit-relates-to/Cargo.toml +index d50d2aa9..c6676bf8 100644 +--- a/git-mit-relates-to/Cargo.toml ++++ b/git-mit-relates-to/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/git-mit/Cargo.toml b/git-mit/Cargo.toml +index ce108e96..fdda0c55 100644 +--- a/git-mit/Cargo.toml ++++ b/git-mit/Cargo.toml +@@ -17,7 +17,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-commit-message-lints/Cargo.toml b/mit-commit-message-lints/Cargo.toml +index 623b120b..042d71b6 100644 +--- a/mit-commit-message-lints/Cargo.toml ++++ b/mit-commit-message-lints/Cargo.toml +@@ -18,7 +18,7 @@ time = { version = "0.3.37", features = ["local-offset"] } + glob = "0.3.2" + thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + regex = "1.11.1" + serde_yaml = "0.9.34" +diff --git a/mit-commit-msg/Cargo.toml b/mit-commit-msg/Cargo.toml +index 3b8c626e..2c5e1a4f 100644 +--- a/mit-commit-msg/Cargo.toml ++++ b/mit-commit-msg/Cargo.toml +@@ -16,7 +16,7 @@ tokio = { version = "1.43.0", features = ["full"] } + mit-lint = "3.2.9" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + miette = { version = "7.4.0", features = [ "fancy" ] } + mit-commit = "3.2.1" +diff --git a/mit-hook-test-helper/Cargo.toml b/mit-hook-test-helper/Cargo.toml +index 44131375..bccd79ab 100644 +--- a/mit-hook-test-helper/Cargo.toml ++++ b/mit-hook-test-helper/Cargo.toml +@@ -14,7 +14,7 @@ description = "Testing help tools for git-mit" + + [dependencies] + tempfile = "3.15.0" +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + + +diff --git a/mit-pre-commit/Cargo.toml b/mit-pre-commit/Cargo.toml +index 40ff8a0f..4ce23ff7 100644 +--- a/mit-pre-commit/Cargo.toml ++++ b/mit-pre-commit/Cargo.toml +@@ -16,7 +16,7 @@ thiserror = "1.0.69" + miette = { version = "7.4.0", features = [ "fancy" ] } + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + +diff --git a/mit-prepare-commit-msg/Cargo.toml b/mit-prepare-commit-msg/Cargo.toml +index fcbbcd14..2aa93263 100644 +--- a/mit-prepare-commit-msg/Cargo.toml ++++ b/mit-prepare-commit-msg/Cargo.toml +@@ -19,7 +19,7 @@ miette = { version = "7.4.0", features = [ "fancy" ] } + shell-words = "1.1.0" + clap_complete = "4.5.42" + clap = { version = "4.5.26", features = ["derive", "cargo", "wrap_help", "env", "unicode" ] } +-git2 = "0.19.0" ++git2 = "0.20.0" + openssl = { version = "0.10.68", optional = true } + mit-commit = "3.2.1" + diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index 9e7f188964ca..67243bc79901 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -26,11 +26,8 @@ rustPlatform.buildRustPackage { useFetchCargoVendor = true; cargoPatches = [ - (fetchpatch { - name = "libgit2-update.patch"; - url = "https://github.com/PurpleBooth/git-mit/pull/1543/commits/3e82a4f5017972c7d28151a468bb71fe7d2279e0.patch"; - hash = "sha256-M9RpZHjOpZZqdHQe57LwMZ9zX6/4BNg3ymz8H3qupFk="; - }) + # https://github.com/PurpleBooth/git-mit/pull/1543 + ./libgit2-update.patch ]; cargoHash = "sha256-uoS6vmHmOVkHS81mrsbbXqP/dAC/FNHAlpTDHSa632k="; diff --git a/pkgs/by-name/gi/gitleaks/package.nix b/pkgs/by-name/gi/gitleaks/package.nix index c2cb7da45aea..74409a2dd39a 100644 --- a/pkgs/by-name/gi/gitleaks/package.nix +++ b/pkgs/by-name/gi/gitleaks/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "gitleaks"; - version = "8.24.3"; + version = "8.25.1"; src = fetchFromGitHub { owner = "zricethezav"; repo = "gitleaks"; tag = "v${version}"; - hash = "sha256-P5PHugSYkC6GSxbbsuA8nvPn9fLjTJOU3yOecntAVEE="; + hash = "sha256-ji13lmGrtJeQuOYi2HsFICs2XUZdmWgsgVrWj/Shh/c="; }; vendorHash = "sha256-MSF9N9kXsIM2WKsjKAVztYypwGPng2EElHx7p6vADqc="; diff --git a/pkgs/by-name/gm/gmni/package.nix b/pkgs/by-name/gm/gmni/package.nix deleted file mode 100644 index 47d3487767ae..000000000000 --- a/pkgs/by-name/gm/gmni/package.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ - stdenv, - lib, - fetchFromSourcehut, - bearssl, - scdoc, -}: - -stdenv.mkDerivation rec { - pname = "gmni"; - version = "1.0"; - - src = fetchFromSourcehut { - owner = "~sircmpwn"; - repo = "gmni"; - rev = version; - sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4="; - }; - - nativeBuildInputs = [ scdoc ]; - buildInputs = [ bearssl ]; - - # Fix build on `gcc-13`: - # inlined from 'xt_end_chain' at src/tofu.c:82:3, - # ...-glibc-2.38-27-dev/include/bits/stdio2.h:54:10: error: '__builtin___snprintf_chk' specified bound 4 exceeds destination size 3 [-Werror=stringop-overflow] - # - # The overflow will not happen in practice, but `snprintf()` gets - # passed one more byte than available. - hardeningDisable = [ "fortify3" ]; - - meta = with lib; { - description = "Gemini client"; - homepage = "https://git.sr.ht/~sircmpwn/gmni"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ - bsima - jb55 - ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/by-name/go/gokapi/go-1.24.patch b/pkgs/by-name/go/gokapi/go-1.24.patch new file mode 100644 index 000000000000..02df74a7fe63 --- /dev/null +++ b/pkgs/by-name/go/gokapi/go-1.24.patch @@ -0,0 +1,13 @@ +diff --git a/build/go-generate/copyStaticFiles.go b/build/go-generate/copyStaticFiles.go +index 9f8a049..de21bdd 100644 +--- a/build/go-generate/copyStaticFiles.go ++++ b/build/go-generate/copyStaticFiles.go +@@ -10,7 +10,7 @@ import ( + ) + + func main() { +- copyFile(build.Default.GOROOT+"/misc/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") ++ copyFile(build.Default.GOROOT+"/lib/wasm/wasm_exec.js", "../../internal/webserver/web/static/js/wasm_exec.js") + copyFile("../../go.mod", "../../build/go.mod") + copyFile("../../openapi.json", "../../internal/webserver/web/static/apidocumentation/openapi.json") + } diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index 4788ad771657..aa92501900fb 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -20,6 +20,10 @@ buildGoModule rec { vendorHash = "sha256-9GRAlgng+yq7q0VQz374jIOCjeDIIDD631BglM/FsQQ="; + patches = [ + ./go-1.24.patch + ]; + # This is the go generate is ran in the upstream builder, but we have to run the components separately for things to work. preBuild = '' cd ./cmd/gokapi/ diff --git a/pkgs/by-name/gr/grap/package.nix b/pkgs/by-name/gr/grap/package.nix index e4589322a0fe..b51ce8452a0c 100644 --- a/pkgs/by-name/gr/grap/package.nix +++ b/pkgs/by-name/gr/grap/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - boost, + boost183, libseccomp, flex, swig, @@ -38,7 +38,7 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - boost.all + boost183.all libseccomp ]; diff --git a/pkgs/by-name/ig/ignition/fix-gjs.patch b/pkgs/by-name/ig/ignition/fix-gjs.patch new file mode 100644 index 000000000000..312042bb5b1c --- /dev/null +++ b/pkgs/by-name/ig/ignition/fix-gjs.patch @@ -0,0 +1,26 @@ +diff --git a/src/io.github.flattool.Ignition.in b/src/io.github.flattool.Ignition.in +index 5c71c3c..0b2ec00 100644 +--- a/src/io.github.flattool.Ignition.in ++++ b/src/io.github.flattool.Ignition.in +@@ -1,7 +1,8 @@ +-#!@GJS@ -m ++#!/usr/bin/env gjs -m + + import { exit, programArgs, programInvocationName } from "system"; + ++imports.package._findEffectiveEntryPointName = () => 'io.github.flattool.Ignition'; + imports.package.init({ + name: "@PACKAGE_NAME@", + version: "@PACKAGE_VERSION@", +diff --git a/src/meson.build b/src/meson.build +index 488fa06..751f8ed 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -23,7 +23,6 @@ data_res = gnome.compile_resources('io.github.flattool.Ignition.data', + ) + + bin_conf = configuration_data() +-bin_conf.set('GJS', find_program('gjs').full_path()) + bin_conf.set('PACKAGE_VERSION', meson.project_version()) + bin_conf.set('PACKAGE_NAME', meson.project_name()) + bin_conf.set('prefix', get_option('prefix')) diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix new file mode 100644 index 000000000000..3d934752cce4 --- /dev/null +++ b/pkgs/by-name/ig/ignition/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + appstream, + blueprint-compiler, + desktop-file-utils, + gettext, + meson, + ninja, + pkg-config, + wrapGAppsHook4, + + gjs, + gtk4, + libadwaita, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "ignition"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "flattool"; + repo = "ignition"; + tag = finalAttrs.version; + hash = "sha256-XVBlwonMHb78XF6mpPYLJ68E5Tb+dFVFqNSsVCCS0xc="; + }; + + patches = [ + # Don't use find_program for detecting gjs. (we don't want to use the build-platform's gjs binary) + # We instead rely on the fact that fixupPhase uses patchShebangs on the script. + # Also, we manually set the effective entrypoint to make gjs properly find our binary. + ./fix-gjs.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + appstream + blueprint-compiler + desktop-file-utils + gettext + gtk4 + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gjs + gtk4 + libadwaita + ]; + + meta = { + description = "Manage startup apps and scripts"; + homepage = "https://github.com/flattool/ignition"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ tomasajt ]; + mainProgram = "io.github.flattool.Ignition"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/io/iotas/package.nix b/pkgs/by-name/io/iotas/package.nix index bb414f217864..79ec2898aefd 100644 --- a/pkgs/by-name/io/iotas/package.nix +++ b/pkgs/by-name/io/iotas/package.nix @@ -20,15 +20,15 @@ python3.pkgs.buildPythonApplication rec { pname = "iotas"; - version = "0.9.5"; + version = "0.11.0"; pyproject = false; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "iotas"; - rev = version; - hash = "sha256-SDapnAGPTi7tnzl3zeNJw2CABhVVAXMyn1bllg8fChw="; + tag = version; + hash = "sha256-9YYKVBjidHBWyUqFvxo3tNx5DQkpililCDLZofESYRw="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3.pkgs.buildPythonApplication rec { webkitgtk_6_0 ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ pygobject3 pygtkspellcheck requests diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index d41b255d3b6a..f6c7c53b8cb9 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-c/fdj4lEmID4u97fGPXnPLULS7Rxe6P8icmsfjGjT+w="; + hash = "sha256-MBkuLvMwAH0858X0TRAK1pL/JwsTIY/6Ra+Vd6X0odA="; }; - cargoHash = "sha256-qPMtYaCvSAnLXrLX20QKbgXo9L1HYxJW4uZIzXhpD/A="; + cargoHash = "sha256-gVxWy8SGvAaavrdZHK/9aKfPAXUtfs98TyFKFkFa3+U="; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index a6bb653c9b65..ce64a516a332 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -4,29 +4,30 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "jwx"; - version = "2.1.5"; + version = "3.0.1"; src = fetchFromGitHub { owner = "lestrrat-go"; - repo = pname; - rev = "v${version}"; - hash = "sha256-JDv1lqfhE16v3hJhf9OD2P2IS1KeLyewHxNlS7Ci2bk="; + repo = "jwx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZVI32z1hUquDUWdaLZGtI0PncboVHx2FJ3BB4MAhX0w="; }; - vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y="; + vendorHash = "sha256-vyqsUZ7IxXI6LZKrSOPxheE/IISKRC0wXB7+xj51xLM="; - sourceRoot = "${src.name}/cmd/jwx"; + sourceRoot = "${finalAttrs.src.name}/cmd/jwx"; - meta = with lib; { + meta = { description = " Implementation of various JWx (Javascript Object Signing and Encryption/JOSE) technologies"; mainProgram = "jwx"; homepage = "https://github.com/lestrrat-go/jwx"; - license = licenses.mit; - maintainers = with maintainers; [ + changelog = "https://github.com/lestrrat-go/jwx/blob/v${finalAttrs.version}/Changes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ arianvp flokli ]; }; -} +}) diff --git a/pkgs/by-name/kr/krita-plugin-gmic/package.nix b/pkgs/by-name/kr/krita-plugin-gmic/package.nix index 25a90fcf9893..db5fdc92aec1 100644 --- a/pkgs/by-name/kr/krita-plugin-gmic/package.nix +++ b/pkgs/by-name/kr/krita-plugin-gmic/package.nix @@ -31,15 +31,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake extra-cmake-modules + libsForQt5.qttools ]; buildInputs = [ fftw krita.unwrapped libsForQt5.kcoreaddons - libsForQt5.qttools ]; + strictDeps = true; + cmakeFlags = [ (lib.cmakeFeature "GMIC_QT_HOST" "krita-plugin") # build krita's gmic instead of using the one from nixpkgs diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 6eef23e5b527..8c55d3ed90ea 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule rec { pname = "lazygit"; - version = "0.49.0"; + version = "0.50.0"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; tag = "v${version}"; - hash = "sha256-hNEznDz+DHalKgmz1fXFivf9T1YJ/jfwcD4baTUO4Cw="; + hash = "sha256-LxPKV6Zt4R+gsZAp7FXqWnAXjEoaFTn44qJBOpbh0P8="; }; vendorHash = null; diff --git a/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch b/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch deleted file mode 100644 index f5a016f63ac3..000000000000 --- a/pkgs/by-name/li/libchop/0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 86fd3be1d31d2e7c09603aa3a8966537ac01bb07 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Tue, 11 Aug 2020 20:30:16 +0200 -Subject: [PATCH] Fix RPC compilation when using libtirpc rather than glibc - ---- - src/block-server.c | 3 +++ - utils/chop-block-server.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/block-server.c b/src/block-server.c -index 3f97417..29b299e 100644 ---- a/src/block-server.c -+++ b/src/block-server.c -@@ -18,6 +18,9 @@ - - /* Server-side stubs. */ - -+#include -+#include -+#include - #include - #include - -diff --git a/utils/chop-block-server.c b/utils/chop-block-server.c -index a2076c0..9462f5d 100644 ---- a/utils/chop-block-server.c -+++ b/utils/chop-block-server.c -@@ -19,6 +19,9 @@ - store, e.g. a GDBM block store, and serves it remotely. A lot of code is - borrowed from `chop-archiver.c'. */ - -+#include -+#include -+#include - #include - - #include --- -2.25.4 - diff --git a/pkgs/by-name/li/libchop/gets-undeclared.patch b/pkgs/by-name/li/libchop/gets-undeclared.patch deleted file mode 100644 index b6cdc77caa84..000000000000 --- a/pkgs/by-name/li/libchop/gets-undeclared.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch is needed to allow builds with newer versions of -the GNU libc (2.16+). - - -commit 66712c23388e93e5c518ebc8515140fa0c807348 -Author: Eric Blake -Date: Thu Mar 29 13:30:41 2012 -0600 - - stdio: don't assume gets any more - - Gnulib intentionally does not have a gets module, and now that C11 - and glibc have dropped it, we should be more proactive about warning - any user on a platform that still has a declaration of this dangerous - interface. - - * m4/stdio_h.m4 (gl_STDIO_H, gl_STDIO_H_DEFAULTS): Drop gets - support. - * modules/stdio (Makefile.am): Likewise. - * lib/stdio-read.c (gets): Likewise. - * tests/test-stdio-c++.cc: Likewise. - * m4/warn-on-use.m4 (gl_WARN_ON_USE_PREPARE): Fix comment. - * lib/stdio.in.h (gets): Make warning occur in more places. - * doc/posix-functions/gets.texi (gets): Update documentation. - Reported by Christer Solskogen. - - Signed-off-by: Eric Blake - -diff --git a/lib/stdio.in.h b/lib/stdio.in.h -index aa7b599..c377b6e 100644 ---- a/lib/stdio.in.h -+++ b/lib/stdio.in.h -@@ -698,22 +698,11 @@ _GL_WARN_ON_USE (getline, "getline is unportable - " - # endif - #endif - --#if @GNULIB_GETS@ --# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# undef gets --# define gets rpl_gets --# endif --_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1))); --_GL_CXXALIAS_RPL (gets, char *, (char *s)); --# else --_GL_CXXALIAS_SYS (gets, char *, (char *s)); --# undef gets --# endif --_GL_CXXALIASWARN (gets); - /* It is very rare that the developer ever has full control of stdin, -- so any use of gets warrants an unconditional warning. Assume it is -- always declared, since it is required by C89. */ -+ so any use of gets warrants an unconditional warning; besides, C11 -+ removed it. */ -+#undef gets -+#if HAVE_RAW_DECL_GETS - _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); - #endif - -@@ -1053,9 +1042,9 @@ _GL_WARN_ON_USE (snprintf, "snprintf is unportable - " - # endif - #endif - --/* Some people would argue that sprintf should be handled like gets -- (for example, OpenBSD issues a link warning for both functions), -- since both can cause security holes due to buffer overruns. -+/* Some people would argue that all sprintf uses should be warned about -+ (for example, OpenBSD issues a link warning for it), -+ since it can cause security holes due to buffer overruns. - However, we believe that sprintf can be used safely, and is more - efficient than snprintf in those safe cases; and as proof of our - belief, we use sprintf in several gnulib modules. So this header diff --git a/pkgs/by-name/li/libchop/package.nix b/pkgs/by-name/li/libchop/package.nix deleted file mode 100644 index 83d064ef08fb..000000000000 --- a/pkgs/by-name/li/libchop/package.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ - fetchurl, - lib, - stdenv, - zlib, - bzip2, - libgcrypt, - gdbm, - gperf, - tdb, - gnutls, - db, - libuuid, - lzo, - pkg-config, - guile, - rpcsvc-proto, - libtirpc, -}: - -stdenv.mkDerivation rec { - pname = "libchop"; - version = "0.5.2"; - - src = fetchurl { - url = "mirror://savannah/libchop/libchop-${version}.tar.gz"; - sha256 = "0fpdyxww41ba52d98blvnf543xvirq1v9xz1i3x1gm9lzlzpmc2g"; - }; - - patches = [ - ./gets-undeclared.patch - ./size_t.patch - ./0001-Fix-RPC-compilation-when-using-libtirpc-rather-than-.patch - ]; - - nativeBuildInputs = [ - pkg-config - gperf - rpcsvc-proto - ]; - - env.NIX_CFLAGS_COMPILE = toString [ "-I${libtirpc.dev}/include/tirpc" ]; - NIX_LDFLAGS = [ "-ltirpc" ]; - - buildInputs = [ - zlib - bzip2 - lzo - libgcrypt - gdbm - db - tdb - gnutls - libuuid - guile - libtirpc - ]; - - doCheck = false; - - preConfigure = '' - sed -re 's%@GUILE@%&/guile%' -i */Makefile.* Makefile.* - ''; - - meta = with lib; { - description = "Tools & library for data backup and distributed storage"; - - longDescription = '' - Libchop is a set of utilities and library for data backup and - distributed storage. Its main application is chop-backup, an - encrypted backup program that supports data integrity checks, - versioning at little cost, distribution among several sites, - selective sharing of stored data, adaptive compression, and more. - The library itself, which chop-backup builds upon, implements - storage techniques such as content-based addressing, content hash - keys, Merkle trees, similarity detection, and lossless compression. - It makes it easy to combine them in different ways. The - ‘chop-archiver’ and ‘chop-block-server’ tools, illustrated in the - manual, provide direct access to these facilities from the command - line. It is written in C and has Guile (Scheme) bindings. - ''; - - homepage = "https://www.nongnu.org/libchop/"; - license = licenses.gpl3Plus; - maintainers = [ ]; - platforms = platforms.gnu ++ platforms.linux; - }; -} diff --git a/pkgs/by-name/li/libchop/size_t.patch b/pkgs/by-name/li/libchop/size_t.patch deleted file mode 100644 index 82b6cb995ef3..000000000000 --- a/pkgs/by-name/li/libchop/size_t.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/chop.c -+++ b/src/chop.c -@@ -539,7 +539,7 @@ extern const chop_class_t chop_gdbm_bloc - chop_qdbm_block_iterator_class; - - const struct chop_class_entry * --chop_lookup_class_entry (const char *str, unsigned int len); -+chop_lookup_class_entry (const char *str, size_t len); - - /* Include the gperf-generated perfect hash table. */ - #include "class-lookup.c" diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix index 4994dfe8697d..2356e3936073 100644 --- a/pkgs/by-name/li/libcmatrix/package.nix +++ b/pkgs/by-name/li/libcmatrix/package.nix @@ -6,6 +6,7 @@ libgcrypt, libsecret, libsoup_3, + cmake, meson, ninja, olm, @@ -30,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: { meson ninja pkg-config + + cmake # used by meson to find olm ]; buildInputs = [ @@ -42,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: { sqlite ]; + prePatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + # 0u is not a valid version number on darwin + substituteInPlace src/meson.build --replace-fail "soversion: '0u'," "soversion: '0'," + ''; + meta = { changelog = "https://source.puri.sm/Librem5/libcmatrix/-/blob/${finalAttrs.src.tag}/NEWS"; description = "Matrix protocol library written in C using GObject"; diff --git a/pkgs/by-name/li/libvpx/package.nix b/pkgs/by-name/li/libvpx/package.nix index 41cc90a17954..dc33fa0bef67 100644 --- a/pkgs/by-name/li/libvpx/package.nix +++ b/pkgs/by-name/li/libvpx/package.nix @@ -99,10 +99,18 @@ let isGeneric = (stdenv.hostPlatform.isPower && stdenv.hostPlatform.isLittleEndian) || stdenv.hostPlatform.parsed.cpu.name == "armv6l" + || stdenv.hostPlatform.isLoongArch64 || stdenv.hostPlatform.isRiscV; target = - if (stdenv.hostPlatform.isBSD || stdenv.hostPlatform != stdenv.buildPlatform) then + if + ( + stdenv.hostPlatform.isBSD + || stdenv.hostPlatform != stdenv.buildPlatform + # https://issues.chromium.org/issues/359039635 + || stdenv.hostPlatform.isLoongArch64 + ) + then (if isGeneric then "generic-gnu" else "${cpu}-${kernel}-gcc") else null; diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index 4d1af75b0af6..c0ff5eb5cc3b 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -52,14 +52,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; - version = "91.0"; + version = "92.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; - hash = "sha256-cBzW8zj2JxzhdMkvs8nWiBID/8FSMT7FkrZ78c0f0ts="; + hash = "sha256-3yiQRGkjvOz80G6s39JHzqytxvGDmV9Lqs5bMxTAejo="; }; passthru = { diff --git a/pkgs/by-name/mo/mopidy-argos/package.nix b/pkgs/by-name/mo/mopidy-argos/package.nix new file mode 100644 index 000000000000..1b7435b05ac6 --- /dev/null +++ b/pkgs/by-name/mo/mopidy-argos/package.nix @@ -0,0 +1,59 @@ +{ + stdenv, + lib, + python3Packages, + fetchFromGitHub, + pkg-config, + meson, + ninja, + appstream-glib, + desktop-file-utils, + wrapGAppsHook3, + gobject-introspection, +}: +python3Packages.buildPythonApplication rec { + pname = "mopidy-argos"; + version = "1.15.0"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "orontee"; + repo = "argos"; + tag = "v${version}"; + hash = "sha256-fHdaYFq38t4uzpVD4qoAeVm5yWgj2O7hy4LDgZ1bZj4="; + }; + postPatch = '' + patchShebangs build-aux/meson/postinstall.py + ''; + + nativeBuildInputs = [ + pkg-config + meson + ninja + appstream-glib + gobject-introspection + desktop-file-utils + wrapGAppsHook3 + ]; + + dependencies = with python3Packages; [ + aiohttp + pycairo + pygobject3 + pyxdg + zeroconf + ]; + + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = { + homepage = "https://github.com/orontee/argos"; + description = "Gtk front-end to control a Mopidy server"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.hufman ]; + mainProgram = "argos"; + }; +} diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix index 12d6456359c3..74d724b86842 100644 --- a/pkgs/by-name/nb/nb-cli/package.nix +++ b/pkgs/by-name/nb/nb-cli/package.nix @@ -17,6 +17,10 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8="; }; + pythonRelaxDeps = [ + "watchfiles" + ]; + build-system = [ python3.pkgs.babel python3.pkgs.pdm-backend @@ -43,7 +47,15 @@ python3.pkgs.buildPythonApplication rec { # no test doCheck = false; - pythonImportsCheck = [ "nb_cli" ]; + pythonImportsCheck = [ + "nb_cli" + "nb_cli.cli" + "nb_cli.compat" + "nb_cli.config" + "nb_cli.handlers" + "nb_cli.i18n" + "nb_cli.log" + ]; passthru.tests = { version = testers.testVersion { package = nb-cli; }; diff --git a/pkgs/by-name/ni/nix-converter/package.nix b/pkgs/by-name/ni/nix-converter/package.nix new file mode 100644 index 000000000000..73345f86b63c --- /dev/null +++ b/pkgs/by-name/ni/nix-converter/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule { + pname = "nix-converter"; + version = "0-unstable-2025-04-14"; + + src = fetchFromGitHub { + owner = "theobori"; + repo = "nix-converter"; + rev = "d06af43bf578f2650417600250e68782478ce98d"; + hash = "sha256-/HEKbE1tLCGGu4xopky/02OWRt23UUTPKQCdi7ThCX8="; + }; + + vendorHash = "sha256-Ay1f9sk8RuJyOS7hl/lrscpxdlIgm9dMow/xTFoR+H4="; + + ldflags = [ + "-s" + "-w" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "All-in-one converter configuration language to Nix and vice versa"; + homepage = "https://github.com/theobori/nix-converter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + theobori + jaredmontoya + ]; + mainProgram = "nix-converter"; + }; +} diff --git a/pkgs/by-name/ol/olm/package.nix b/pkgs/by-name/ol/olm/package.nix index 0eded23b94fe..ec0aeb705e6c 100644 --- a/pkgs/by-name/ol/olm/package.nix +++ b/pkgs/by-name/ol/olm/package.nix @@ -21,11 +21,18 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - substituteInPlace olm.pc.in \ - --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ - --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ - ''; + postPatch = + '' + substituteInPlace olm.pc.in \ + --replace '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + '' + # Clang 19 has become more strict about assigning to const variables + # Patch from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281497 + + lib.optionalString (stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "19") '' + substituteInPlace include/olm/list.hh \ + --replace-fail "T * const other_pos = other._data;" "T const * other_pos = other._data;" + ''; meta = with lib; { description = "Implements double cryptographic ratchet and Megolm ratchet"; diff --git a/pkgs/by-name/oo/oobicpl/package.nix b/pkgs/by-name/oo/oobicpl/package.nix deleted file mode 100644 index c8d5a85b860e..000000000000 --- a/pkgs/by-name/oo/oobicpl/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - libminc, - bicpl, - arguments, - pcre-cpp, -}: - -stdenv.mkDerivation rec { - pname = "oobicpl"; - version = "unstable-2020-08-12"; - - src = fetchFromGitHub { - owner = "BIC-MNI"; - repo = pname; - rev = "a9409da8a5bb4925438f32aff577b6333faec28b"; - sha256 = "0b4chjhr32wbb1sash8cq1jfnr7rzdq84hif8anlrjqd3l0gw357"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - libminc - bicpl - arguments - pcre-cpp - ]; - - cmakeFlags = [ - "-DLIBMINC_DIR=${libminc}/lib/cmake" - "-DBICPL_DIR=${bicpl}/lib" - "-DARGUMENTS_DIR=${arguments}/lib" - "-DOOBICPL_BUILD_SHARED_LIBS=TRUE" - ]; - - meta = with lib; { - homepage = "https://github.com/BIC-MNI/oobicpl"; - description = "Brain Imaging Centre object-oriented programming library (and tools)"; - maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.unix; - license = licenses.free; - }; -} diff --git a/pkgs/by-name/op/optinix/package.nix b/pkgs/by-name/op/optinix/package.nix index 044b190e4e20..21a69da48689 100644 --- a/pkgs/by-name/op/optinix/package.nix +++ b/pkgs/by-name/op/optinix/package.nix @@ -20,11 +20,6 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - preBuild = '' - substituteInPlace vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go \ - --replace-fail '!os.IsNotExist(err)' '!os.IsNotExist(err) && !os.IsPermission(err)' - ''; - postInstall = '' installShellCompletion --cmd optinix \ --bash <($out/bin/optinix completion bash) \ diff --git a/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch new file mode 100644 index 000000000000..425fa95e508b --- /dev/null +++ b/pkgs/by-name/os/osm-gps-map/dont-require-libsoup.patch @@ -0,0 +1,13 @@ +diff --git a/osmgpsmap-1.0.pc.in b/osmgpsmap-1.0.pc.in +index 86efb3c..da6d1a9 100644 +--- a/osmgpsmap-1.0.pc.in ++++ b/osmgpsmap-1.0.pc.in +@@ -6,6 +6,7 @@ includedir=@includedir@ + Name: @PACKAGE_NAME@ + Description: Moving map widget using openstreet map data + Version: @PACKAGE_VERSION@ +-Requires: gtk+-3.0 libsoup-2.4 ++Requires: gtk+-3.0 ++Requires.private: libsoup-2.4 + Libs: -L${libdir} -losmgpsmap-1.0 + Cflags: -I${includedir}/osmgpsmap-1.0 diff --git a/pkgs/by-name/os/osm-gps-map/package.nix b/pkgs/by-name/os/osm-gps-map/package.nix index 4bae4c46fd45..5f480db6582e 100644 --- a/pkgs/by-name/os/osm-gps-map/package.nix +++ b/pkgs/by-name/os/osm-gps-map/package.nix @@ -11,15 +11,22 @@ stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "osm-gps-map"; version = "1.2.0"; src = fetchzip { - url = "https://github.com/nzjrs/osm-gps-map/releases/download/${version}/osm-gps-map-${version}.tar.gz"; + url = "https://github.com/nzjrs/osm-gps-map/releases/download/${finalAttrs.version}/osm-gps-map-${finalAttrs.version}.tar.gz"; sha256 = "sha256-ciw28YXhR+GC6B2VPC+ZxjyhadOk3zYGuOssSgqjwH0="; }; + patches = [ + # libsoup is only used internally + # it should only be listed as private requirement + # https://github.com/nzjrs/osm-gps-map/pull/108 + ./dont-require-libsoup.patch + ]; + outputs = [ "out" "dev" @@ -35,15 +42,18 @@ stdenv.mkDerivation rec { buildInputs = [ cairo glib - gtk3 libsoup_2_4 ]; - meta = with lib; { + propagatedBuildInputs = [ + gtk3 + ]; + + meta = { description = "GTK widget for displaying OpenStreetMap tiles"; homepage = "https://nzjrs.github.io/osm-gps-map"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ hrdinka ]; - platforms = platforms.linux ++ platforms.darwin; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ hrdinka ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +}) diff --git a/pkgs/by-name/pa/paco/package.nix b/pkgs/by-name/pa/paco/package.nix deleted file mode 100644 index 1aee35c2e486..000000000000 --- a/pkgs/by-name/pa/paco/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - fetchpatch, -}: - -buildGoModule rec { - pname = "paco"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "pacolang"; - repo = "paco"; - rev = "v${version}"; - hash = "sha256-sCU7cjmsUTrhf/7Lm3wBPKwk80SAhCfc4lrCBggspw8="; - }; - - vendorHash = "sha256-J0TKp1df5IWq3Irlzf1lvhWlXnP//MsVqs9M8TtEraw="; - - patches = [ - # Set correct package path in go.mod - (fetchpatch { - url = "https://github.com/pacolang/paco/pull/1/commits/886f0407e94418d34c7e062c6857834aea3c99ac.patch"; - hash = "sha256-HRNJSyWz1OY+kCV+eaRJbaDXkH4n1NaMpFxCuEhocK4="; - }) - ]; - - subPackages = [ "." ]; - - ldflags = [ - "-s" - "-w" - ]; - - meta = with lib; { - description = "Simple compiled programming language"; - mainProgram = "paco"; - homepage = "https://github.com/pacolang/paco"; - license = licenses.mit; - maintainers = with maintainers; [ hugolgst ]; - }; -} diff --git a/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch b/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch new file mode 100644 index 000000000000..114f88cfa537 --- /dev/null +++ b/pkgs/by-name/pi/pilot-link/incompatible-pointer-type.patch @@ -0,0 +1,15 @@ +Index: pilot-link/src/pilot-read-todos.c +=================================================================== +--- pilot-link/src/pilot-read-todos.c ++++ pilot-link/src/pilot-read-todos.c +@@ -216,9 +216,9 @@ + break; + } + else { + if (pi_file_read_record +- (pif, i, (void *) &ptr, &len, &attr, &category, ++ (pif, i, (void *) &ptr, (size_t *) &len, &attr, &category, + 0)) + break; + + pi_buffer_clear(recbuf); diff --git a/pkgs/by-name/pi/pilot-link/package.nix b/pkgs/by-name/pi/pilot-link/package.nix index 6afc7c1cfee5..a7b6f3813b50 100644 --- a/pkgs/by-name/pi/pilot-link/package.nix +++ b/pkgs/by-name/pi/pilot-link/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { pname = "pilot-link"; - version = "0.12.3-unstable-2022-09-26"; + version = "0.13.0-unstable-2022-09-26"; src = fetchFromGitHub { owner = "desrod"; @@ -32,7 +32,10 @@ stdenv.mkDerivation { # https://github.com/desrod/pilot-link/issues/16 # https://aur.archlinux.org/packages/pilot-link-git patches = - [ ./configure-checks.patch ] + [ + ./configure-checks.patch + ./incompatible-pointer-type.patch + ] ++ lib.optionals enableConduits [ ./format-string-literals.patch ] ++ lib.optionals enableLibpng [ ./pilot-link-png14.patch ]; @@ -54,6 +57,8 @@ stdenv.mkDerivation { ++ lib.optionals enableLibpng [ "--enable-libpng" ] ++ lib.optionals enableLibusb [ "--enable-libusb" ]; + enableParallelBuilding = true; + meta = { description = "Suite of tools for connecting to PalmOS handheld devices"; homepage = "https://github.com/desrod/pilot-link"; diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix index 0cf6e9f50a27..8116962252f2 100644 --- a/pkgs/by-name/po/pocket-id/package.nix +++ b/pkgs/by-name/po/pocket-id/package.nix @@ -12,13 +12,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "pocket-id"; - version = "0.49.0"; + version = "0.51.0"; src = fetchFromGitHub { owner = "pocket-id"; repo = "pocket-id"; tag = "v${finalAttrs.version}"; - hash = "sha256-fyyeYArjhsS/R9VsZsRM3oO5fz8EUqjNIuvFJpGZbds="; + hash = "sha256-tNPbowMytALmvJ1H8IWCmXIQFlXKEHA5+T9FWdpaLi0="; }; backend = buildGoModule { diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 95e683c07dfb..767b4c68fc66 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -139,6 +139,11 @@ buildPythonPackage rec { "test_list_poetry_managed" "test_find_all_with_poetry_managed" "test_find_poetry_managed_pythons" + # Flaky + "test_threading_property_types" + "test_threading_single_thread_safe" + "test_threading_property_caching" + "test_threading_atomic_cached_property_different_instances" ]; pytestFlagsArray = [ diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix index bdac9ee5e202..03f555ec84a3 100644 --- a/pkgs/by-name/po/postfix/package.nix +++ b/pkgs/by-name/po/postfix/package.nix @@ -67,11 +67,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; - hash = "sha256-dYaNt6jtJSzToUwTo844Pd1CVjFgwCAn0GEgLuNnmb8="; + hash = "sha256-vMpWQTLUz1+cnONU2rndNe6OniGQCGRiPIFdrBa/vCc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/qp/qpid-cpp/package.nix b/pkgs/by-name/qp/qpid-cpp/package.nix index 5d69a4c87416..61f415e6480b 100644 --- a/pkgs/by-name/qp/qpid-cpp/package.nix +++ b/pkgs/by-name/qp/qpid-cpp/package.nix @@ -3,7 +3,7 @@ stdenv, fetchpatch, fetchurl, - boost, + boost183, cmake, libuuid, python3, @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { python3 ]; buildInputs = [ - boost + boost183 libuuid ruby ]; diff --git a/pkgs/by-name/ra/ratman/package.nix b/pkgs/by-name/ra/ratman/package.nix index 09e8b91d7568..e9f79baa9a6f 100644 --- a/pkgs/by-name/ra/ratman/package.nix +++ b/pkgs/by-name/ra/ratman/package.nix @@ -19,8 +19,8 @@ rustPlatform.buildRustPackage rec { domain = "codeberg.org"; owner = "irdest"; repo = "irdest"; - rev = "${version}"; - sha256 = "sha256-OuKUZSvIUekhbe1LoEFBL8+sU2KLXBsp1JCEEuxkUlk="; + tag = "${version}"; + hash = "sha256-rdKfKbikyqs0Y/y9A8XRVSKenjHD5rS3blxwy98Tvmg="; }; useFetchCargoVendor = true; diff --git a/pkgs/by-name/sh/share-preview/package.nix b/pkgs/by-name/sh/share-preview/package.nix index 908b3ce9e0a3..6ecd9e27d25b 100644 --- a/pkgs/by-name/sh/share-preview/package.nix +++ b/pkgs/by-name/sh/share-preview/package.nix @@ -26,10 +26,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-FqualaTkirB+gBcgkThQpSBHhM4iaXkiGujwBUnUX0E="; }; + patches = [ + ./wasm-bindgen.patch + ]; + cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) src; + inherit (finalAttrs) src patches; name = "share-preview-${finalAttrs.version}"; - hash = "sha256-XY48fQ5HLvZ1nxLk6rbuxSBAHAPUcnwu/5AwgTWhfbg="; + hash = "sha256-lDSRXe+AjJzWT0hda/aev6kNJAvHblGmmAYXdYhrnQs="; }; nativeBuildInputs = [ @@ -59,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Preview and debug websites metadata tags for social media share"; homepage = "https://apps.gnome.org/SharePreview"; + downloadPage = "https://github.com/rafaelmardojai/share-preview"; + changelog = "https://github.com/rafaelmardojai/share-preview/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; mainProgram = "share-preview"; teams = [ lib.teams.gnome-circle ]; diff --git a/pkgs/by-name/sh/share-preview/wasm-bindgen.patch b/pkgs/by-name/sh/share-preview/wasm-bindgen.patch new file mode 100644 index 000000000000..1fbdac01b610 --- /dev/null +++ b/pkgs/by-name/sh/share-preview/wasm-bindgen.patch @@ -0,0 +1,3423 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 6bf4e0c..633a6e4 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1,12 +1,12 @@ + # This file is automatically @generated by Cargo. + # It is not intended for manual editing. +-version = 3 ++version = 4 + + [[package]] +-name = "adler" +-version = "1.0.2" ++name = "adler2" ++version = "2.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" ++checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + + [[package]] + name = "aead" +@@ -64,104 +64,107 @@ dependencies = [ + + [[package]] + name = "aho-corasick" +-version = "0.7.18" ++version = "1.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" ++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" + dependencies = [ + "memchr", + ] + + [[package]] + name = "anyhow" +-version = "1.0.56" ++version = "1.0.98" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" ++checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487" + + [[package]] + name = "async-channel" +-version = "1.6.1" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" ++dependencies = [ ++ "concurrent-queue", ++ "event-listener 2.5.3", ++ "futures-core", ++] ++ ++[[package]] ++name = "async-channel" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" ++checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" + dependencies = [ + "concurrent-queue", +- "event-listener", ++ "event-listener-strategy", + "futures-core", ++ "pin-project-lite", + ] + + [[package]] + name = "async-executor" +-version = "1.4.1" ++version = "1.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" ++checksum = "30ca9a001c1e8ba5149f91a74362376cc6bc5b919d92d988668657bd570bdcec" + dependencies = [ + "async-task", + "concurrent-queue", +- "fastrand", +- "futures-lite", +- "once_cell", ++ "fastrand 2.3.0", ++ "futures-lite 2.6.0", + "slab", + ] + + [[package]] + name = "async-global-executor" +-version = "2.0.3" ++version = "2.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a" ++checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" + dependencies = [ +- "async-channel", ++ "async-channel 2.3.1", + "async-executor", + "async-io", +- "async-mutex", ++ "async-lock", + "blocking", +- "futures-lite", +- "num_cpus", ++ "futures-lite 2.6.0", + "once_cell", + ] + + [[package]] + name = "async-io" +-version = "1.6.0" ++version = "2.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a811e6a479f2439f0c04038796b5cfb3d2ad56c230e0f2d3f7b04d68cfee607b" ++checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" + dependencies = [ ++ "async-lock", ++ "cfg-if", + "concurrent-queue", +- "futures-lite", +- "libc", +- "log", +- "once_cell", ++ "futures-io", ++ "futures-lite 2.6.0", + "parking", + "polling", ++ "rustix", + "slab", +- "socket2", +- "waker-fn", +- "winapi", ++ "tracing", ++ "windows-sys 0.59.0", + ] + + [[package]] + name = "async-lock" +-version = "2.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e97a171d191782fba31bb902b14ad94e24a68145032b7eedf871ab0bc0d077b6" +-dependencies = [ +- "event-listener", +-] +- +-[[package]] +-name = "async-mutex" +-version = "1.4.0" ++version = "3.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" ++checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" + dependencies = [ +- "event-listener", ++ "event-listener 5.4.0", ++ "event-listener-strategy", ++ "pin-project-lite", + ] + + [[package]] + name = "async-std" +-version = "1.12.0" ++version = "1.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" ++checksum = "730294c1c08c2e0f85759590518f6333f0d5a0a766a27d519c1b244c3dfd8a24" + dependencies = [ +- "async-channel", ++ "async-channel 1.9.0", + "async-global-executor", + "async-io", + "async-lock", +@@ -169,7 +172,7 @@ dependencies = [ + "futures-channel", + "futures-core", + "futures-io", +- "futures-lite", ++ "futures-lite 2.6.0", + "gloo-timers", + "kv-log-macro", + "log", +@@ -183,26 +186,26 @@ dependencies = [ + + [[package]] + name = "async-task" +-version = "4.2.0" ++version = "4.7.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" ++checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" + + [[package]] + name = "async-trait" +-version = "0.1.53" ++version = "0.1.88" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" ++checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "atomic-waker" +-version = "1.0.0" ++version = "1.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" ++checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + + [[package]] + name = "atty" +@@ -210,34 +213,34 @@ version = "0.2.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" + dependencies = [ +- "hermit-abi", ++ "hermit-abi 0.1.19", + "libc", + "winapi", + ] + + [[package]] + name = "autocfg" +-version = "1.1.0" ++version = "1.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" ++checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" + + [[package]] + name = "base-x" +-version = "0.2.8" ++version = "0.2.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" ++checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" + + [[package]] + name = "base64" +-version = "0.13.0" ++version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" ++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" + + [[package]] + name = "bit_field" +-version = "0.10.1" ++version = "0.10.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" ++checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + + [[package]] + name = "bitflags" +@@ -247,9 +250,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "bitflags" +-version = "2.4.0" ++version = "2.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" ++checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd" + + [[package]] + name = "bitmaps" +@@ -277,35 +280,34 @@ dependencies = [ + + [[package]] + name = "blocking" +-version = "1.2.0" ++version = "1.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" ++checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" + dependencies = [ +- "async-channel", ++ "async-channel 2.3.1", + "async-task", +- "atomic-waker", +- "fastrand", +- "futures-lite", +- "once_cell", ++ "futures-io", ++ "futures-lite 2.6.0", ++ "piper", + ] + + [[package]] + name = "bumpalo" +-version = "3.9.1" ++version = "3.17.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a4a45a46ab1f2412e53d3a0ade76ffad2025804294569aae387231a0cd6e0899" ++checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" + + [[package]] + name = "bytemuck" +-version = "1.8.0" ++version = "1.22.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0e851ca7c24871e7336801608a4797d7376545b6928a10d32d75685687141ead" ++checksum = "b6b1fc10dbac614ebc03540c9dbd60e83887fda27794998c6528f1782047d540" + + [[package]] + name = "byteorder" +-version = "1.4.3" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" ++checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + + [[package]] + name = "bytes" +@@ -315,23 +317,17 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" + + [[package]] + name = "bytes" +-version = "1.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +- +-[[package]] +-name = "cache-padded" +-version = "1.2.0" ++version = "1.10.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c" ++checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" + + [[package]] + name = "cairo-rs" +-version = "0.19.2" ++version = "0.19.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" ++checksum = "b2ac2a4d0e69036cf0062976f6efcba1aaee3e448594e6514bb2ddf87acce562" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "cairo-sys-rs", + "glib", + "libc", +@@ -351,17 +347,21 @@ dependencies = [ + + [[package]] + name = "cc" +-version = "1.0.73" ++version = "1.2.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11" ++checksum = "04da6a0d40b948dfc4fa8f5bbf402b0fc1a64a28dbf7d12ffd683550f2c1b63a" ++dependencies = [ ++ "shlex", ++] + + [[package]] + name = "cfg-expr" +-version = "0.10.2" ++version = "0.15.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5e068cb2806bbc15b439846dc16c5f89f8599f2c3e4d73d4449d38f9b2f0b6c5" ++checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" + dependencies = [ + "smallvec", ++ "target-lexicon", + ] + + [[package]] +@@ -387,18 +387,18 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + + [[package]] + name = "concurrent-queue" +-version = "1.2.2" ++version = "2.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" ++checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" + dependencies = [ +- "cache-padded", ++ "crossbeam-utils", + ] + + [[package]] + name = "const_fn" +-version = "0.4.9" ++version = "0.4.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" ++checksum = "2f8a2ca5ac02d09563609681103aada9e1777d54fc57a5acd7a41404f9c93b6e" + + [[package]] + name = "convert_case" +@@ -425,9 +425,9 @@ dependencies = [ + + [[package]] + name = "cpufeatures" +-version = "0.2.2" ++version = "0.2.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" ++checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" + dependencies = [ + "libc", + ] +@@ -440,63 +440,43 @@ checksum = "dcb25d077389e53838a8158c8e99174c5a9d902dee4904320db714f3c653ffba" + + [[package]] + name = "crc32fast" +-version = "1.3.2" ++version = "1.4.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" ++checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" + dependencies = [ + "cfg-if", + ] + +-[[package]] +-name = "crossbeam-channel" +-version = "0.5.4" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" +-dependencies = [ +- "cfg-if", +- "crossbeam-utils", +-] +- + [[package]] + name = "crossbeam-deque" +-version = "0.8.1" ++version = "0.8.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" ++checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51" + dependencies = [ +- "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", + ] + + [[package]] + name = "crossbeam-epoch" +-version = "0.9.8" ++version = "0.9.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1145cf131a2c6ba0615079ab6a638f7e1973ac9c2634fcbeaaad6114246efe8c" ++checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" + dependencies = [ +- "autocfg", +- "cfg-if", + "crossbeam-utils", +- "lazy_static", +- "memoffset", +- "scopeguard", + ] + + [[package]] + name = "crossbeam-utils" +-version = "0.8.8" ++version = "0.8.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0bf124c720b7686e3c2663cf54062ab0f68a88af2fb6a030e87e30bf721fcb38" +-dependencies = [ +- "cfg-if", +- "lazy_static", +-] ++checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" + + [[package]] + name = "crunchy" +-version = "0.2.2" ++version = "0.2.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" ++checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929" + + [[package]] + name = "crypto-mac" +@@ -522,27 +502,17 @@ dependencies = [ + "proc-macro2", + "quote", + "smallvec", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] + name = "cssparser-macros" +-version = "0.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dfae75de57f2b2e85e8768c3ea840fd159c8f33e2b6522c7835b7abac81be16e" +-dependencies = [ +- "quote", +- "syn 1.0.89", +-] +- +-[[package]] +-name = "ctor" +-version = "0.1.22" ++version = "0.6.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" ++checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" + dependencies = [ + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] +@@ -556,9 +526,9 @@ dependencies = [ + + [[package]] + name = "curl" +-version = "0.4.43" ++version = "0.4.47" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f" ++checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265" + dependencies = [ + "curl-sys", + "libc", +@@ -566,14 +536,14 @@ dependencies = [ + "openssl-sys", + "schannel", + "socket2", +- "winapi", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "curl-sys" +-version = "0.4.53+curl-7.82.0" ++version = "0.4.80+curl-8.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8092905a5a9502c312f223b2775f57ec5c5b715f9a15ee9d2a8591d1364a0352" ++checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734" + dependencies = [ + "cc", + "libc", +@@ -582,17 +552,7 @@ dependencies = [ + "openssl-sys", + "pkg-config", + "vcpkg", +- "winapi", +-] +- +-[[package]] +-name = "dashmap" +-version = "4.0.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +-dependencies = [ +- "cfg-if", +- "num_cpus", ++ "windows-sys 0.52.0", + ] + + [[package]] +@@ -603,15 +563,15 @@ checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" + + [[package]] + name = "derive_more" +-version = "0.99.17" ++version = "0.99.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" ++checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f" + dependencies = [ + "convert_case", + "proc-macro2", + "quote", +- "rustc_version 0.4.0", +- "syn 1.0.89", ++ "rustc_version 0.4.1", ++ "syn 2.0.100", + ] + + [[package]] +@@ -629,38 +589,49 @@ version = "1.0.4" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + ++[[package]] ++name = "displaydoc" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ + [[package]] + name = "dtoa" +-version = "0.4.8" ++version = "1.0.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" ++checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04" + + [[package]] + name = "dtoa-short" +-version = "0.3.3" ++version = "0.3.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bde03329ae10e79ede66c9ce4dc930aa8599043b0743008548680f25b91502d6" ++checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87" + dependencies = [ + "dtoa", + ] + + [[package]] + name = "ego-tree" +-version = "0.6.2" ++version = "0.6.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" ++checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" + + [[package]] + name = "either" +-version = "1.6.1" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" + + [[package]] + name = "encoding_rs" +-version = "0.8.30" ++version = "0.8.35" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" ++checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" + dependencies = [ + "cfg-if", + ] +@@ -680,56 +651,101 @@ dependencies = [ + + [[package]] + name = "equivalent" +-version = "1.0.1" ++version = "1.0.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f" ++ ++[[package]] ++name = "errno" ++version = "0.3.11" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "976dd42dc7e85965fe702eb8164f21f450704bdde31faefd6471dba214cb594e" ++dependencies = [ ++ "libc", ++ "windows-sys 0.59.0", ++] ++ ++[[package]] ++name = "event-listener" ++version = "2.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" ++checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + + [[package]] + name = "event-listener" +-version = "2.5.2" ++version = "5.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" ++checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae" ++dependencies = [ ++ "concurrent-queue", ++ "parking", ++ "pin-project-lite", ++] ++ ++[[package]] ++name = "event-listener-strategy" ++version = "0.5.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" ++dependencies = [ ++ "event-listener 5.4.0", ++ "pin-project-lite", ++] + + [[package]] + name = "exr" +-version = "1.5.3" ++version = "1.73.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e8af5ef47e2ed89d23d0ecbc1b681b30390069de70260937877514377fc24feb" ++checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0" + dependencies = [ + "bit_field", +- "flume 0.10.14", + "half", + "lebe", + "miniz_oxide", ++ "rayon-core", + "smallvec", +- "threadpool", + "zune-inflate", + ] + + [[package]] + name = "fastrand" +-version = "1.7.0" ++version = "1.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf" ++checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" + dependencies = [ + "instant", + ] + ++[[package]] ++name = "fastrand" ++version = "2.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" ++ ++[[package]] ++name = "fdeflate" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c" ++dependencies = [ ++ "simd-adler32", ++] ++ + [[package]] + name = "field-offset" +-version = "0.3.4" ++version = "0.3.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1e1c54951450cbd39f3dbcf1005ac413b49487dabf18a720ad2383eccfeffb92" ++checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" + dependencies = [ + "memoffset", +- "rustc_version 0.3.3", ++ "rustc_version 0.4.1", + ] + + [[package]] + name = "flate2" +-version = "1.0.25" ++version = "1.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" ++checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece" + dependencies = [ + "crc32fast", + "miniz_oxide", +@@ -746,19 +762,6 @@ dependencies = [ + "spinning_top", + ] + +-[[package]] +-name = "flume" +-version = "0.10.14" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +-dependencies = [ +- "futures-core", +- "futures-sink", +- "nanorand", +- "pin-project", +- "spin", +-] +- + [[package]] + name = "fnv" + version = "1.0.7" +@@ -767,11 +770,10 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + + [[package]] + name = "form_urlencoded" +-version = "1.0.1" ++version = "1.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" ++checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" + dependencies = [ +- "matches", + "percent-encoding", + ] + +@@ -787,24 +789,24 @@ dependencies = [ + + [[package]] + name = "futures-channel" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" ++checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" + dependencies = [ + "futures-core", + ] + + [[package]] + name = "futures-core" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" ++checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + + [[package]] + name = "futures-executor" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" ++checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f" + dependencies = [ + "futures-core", + "futures-task", +@@ -813,17 +815,17 @@ dependencies = [ + + [[package]] + name = "futures-io" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" ++checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + + [[package]] + name = "futures-lite" +-version = "1.12.0" ++version = "1.13.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7694489acd39452c77daa48516b894c153f192c3578d5a839b62c58099fcbf48" ++checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" + dependencies = [ +- "fastrand", ++ "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", +@@ -832,34 +834,47 @@ dependencies = [ + "waker-fn", + ] + ++[[package]] ++name = "futures-lite" ++version = "2.6.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" ++dependencies = [ ++ "fastrand 2.3.0", ++ "futures-core", ++ "futures-io", ++ "parking", ++ "pin-project-lite", ++] ++ + [[package]] + name = "futures-macro" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" ++checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "futures-sink" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" ++checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + + [[package]] + name = "futures-task" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" ++checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + + [[package]] + name = "futures-util" +-version = "0.3.21" ++version = "0.3.31" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" ++checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" + dependencies = [ + "futures-core", + "futures-io", +@@ -882,9 +897,9 @@ dependencies = [ + + [[package]] + name = "gdk-pixbuf" +-version = "0.19.2" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f6a23f8a0b5090494fd04924662d463f8386cc678dd3915015a838c1a3679b92" ++checksum = "624eaba126021103c7339b2e179ae4ee8cdab842daab419040710f38ed9f8699" + dependencies = [ + "gdk-pixbuf-sys", + "gio", +@@ -894,9 +909,9 @@ dependencies = [ + + [[package]] + name = "gdk-pixbuf-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3dcbd04c1b2c4834cc008b4828bc917d062483b88d26effde6342e5622028f96" ++checksum = "4efa05a4f83c8cc50eb4d883787b919b85e5f1d8dd10b5a1df53bf5689782379" + dependencies = [ + "gio-sys", + "glib-sys", +@@ -907,9 +922,9 @@ dependencies = [ + + [[package]] + name = "gdk4" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" ++checksum = "db265c9dd42d6a371e09e52deab3a84808427198b86ac792d75fd35c07990a07" + dependencies = [ + "cairo-rs", + "gdk-pixbuf", +@@ -922,9 +937,9 @@ dependencies = [ + + [[package]] + name = "gdk4-sys" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" ++checksum = "c9418fb4e8a67074919fe7604429c45aa74eb9df82e7ca529767c6d4e9dc66dd" + dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", +@@ -939,9 +954,9 @@ dependencies = [ + + [[package]] + name = "generic-array" +-version = "0.14.5" ++version = "0.14.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd48d33ec7f05fbfa152300fdad764757cbded343c1aa1cff2fbaf4134851803" ++checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" + dependencies = [ + "typenum", + "version_check", +@@ -969,15 +984,13 @@ dependencies = [ + + [[package]] + name = "getrandom" +-version = "0.2.6" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" ++checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" + dependencies = [ + "cfg-if", +- "js-sys", + "libc", +- "wasi 0.10.2+wasi-snapshot-preview1", +- "wasm-bindgen", ++ "wasi 0.11.0+wasi-snapshot-preview1", + ] + + [[package]] +@@ -992,9 +1005,9 @@ dependencies = [ + + [[package]] + name = "gettext-sys" +-version = "0.21.3" ++version = "0.21.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" ++checksum = "f7b8797f28f2dabfbe2caadb6db4f7fd739e251b5ede0a2ba49e506071edcf67" + dependencies = [ + "cc", + "temp-dir", +@@ -1012,9 +1025,9 @@ dependencies = [ + + [[package]] + name = "gif" +-version = "0.11.3" ++version = "0.13.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c3a7187e78088aead22ceedeee99779455b23fc231fe13ec443f99bb71694e5b" ++checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2" + dependencies = [ + "color_quant", + "weezl", +@@ -1022,9 +1035,9 @@ dependencies = [ + + [[package]] + name = "gio" +-version = "0.19.3" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c64947d08d7fbb03bf8ad1f25a8ac6cf4329bc772c9b7e5abe7bf9493c81194f" ++checksum = "4c49f117d373ffcc98a35d114db5478bc223341cff53e39a5d6feced9e2ddffe" + dependencies = [ + "futures-channel", + "futures-core", +@@ -1040,9 +1053,9 @@ dependencies = [ + + [[package]] + name = "gio-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcf8e1d9219bb294636753d307b030c1e8a032062cba74f493c431a5c8b81ce4" ++checksum = "2cd743ba4714d671ad6b6234e8ab2a13b42304d0e13ab7eba1dcdd78a7d6d4ef" + dependencies = [ + "glib-sys", + "gobject-sys", +@@ -1053,11 +1066,11 @@ dependencies = [ + + [[package]] + name = "glib" +-version = "0.19.3" ++version = "0.19.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "01e191cc1af1f35b9699213107068cd3fe05d9816275ac118dc785a0dd8faebf" ++checksum = "39650279f135469465018daae0ba53357942a5212137515777d5fdca74984a44" + dependencies = [ +- "bitflags 2.4.0", ++ "bitflags 2.9.0", + "futures-channel", + "futures-core", + "futures-executor", +@@ -1075,22 +1088,22 @@ dependencies = [ + + [[package]] + name = "glib-macros" +-version = "0.19.3" ++version = "0.19.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9972bb91643d589c889654693a4f1d07697fdcb5d104b5c44fb68649ba1bf68d" ++checksum = "4429b0277a14ae9751350ad9b658b1be0abb5b54faa5bcdf6e74a3372582fad7" + dependencies = [ +- "heck 0.5.0", ++ "heck", + "proc-macro-crate", + "proc-macro2", + "quote", +- "syn 2.0.53", ++ "syn 2.0.100", + ] + + [[package]] + name = "glib-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "630f097773d7c7a0bb3258df4e8157b47dc98bbfa0e60ad9ab56174813feced4" ++checksum = "5c2dc18d3a82b0006d470b13304fbbb3e0a9bd4884cf985a60a7ed733ac2c4a5" + dependencies = [ + "libc", + "system-deps", +@@ -1098,9 +1111,9 @@ dependencies = [ + + [[package]] + name = "gloo-timers" +-version = "0.2.3" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" ++checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" + dependencies = [ + "futures-channel", + "futures-core", +@@ -1110,9 +1123,9 @@ dependencies = [ + + [[package]] + name = "gobject-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c85e2b1080b9418dd0c58b498da3a5c826030343e0ef07bde6a955d28de54979" ++checksum = "2e697e252d6e0416fd1d9e169bda51c0f1c926026c39ca21fbe8b1bb5c3b8b9e" + dependencies = [ + "glib-sys", + "libc", +@@ -1121,9 +1134,9 @@ dependencies = [ + + [[package]] + name = "graphene-rs" +-version = "0.19.2" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "99e4d388e96c5f29e2b2f67045d229ddf826d0a8d6d282f94ed3b34452222c91" ++checksum = "f5fb86031d24d9ec0a2a15978fc7a65d545a2549642cf1eb7c3dda358da42bcf" + dependencies = [ + "glib", + "graphene-sys", +@@ -1132,9 +1145,9 @@ dependencies = [ + + [[package]] + name = "graphene-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "236ed66cc9b18d8adf233716f75de803d0bf6fc806f60d14d948974a12e240d0" ++checksum = "2f530e0944bccba4b55065e9c69f4975ad691609191ebac16e13ab8e1f27af05" + dependencies = [ + "glib-sys", + "libc", +@@ -1144,9 +1157,9 @@ dependencies = [ + + [[package]] + name = "gsk4" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" ++checksum = "7563884bf6939f4468e5d94654945bdd9afcaf8c3ba4c5dd17b5342b747221be" + dependencies = [ + "cairo-rs", + "gdk4", +@@ -1159,9 +1172,9 @@ dependencies = [ + + [[package]] + name = "gsk4-sys" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" ++checksum = "23024bf2636c38bbd1f822f58acc9d1c25b28da896ff0f291a1a232d4272b3dc" + dependencies = [ + "cairo-sys-rs", + "gdk4-sys", +@@ -1181,9 +1194,9 @@ checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a" + + [[package]] + name = "gtk4" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" ++checksum = "b04e11319b08af11358ab543105a9e49b0c491faca35e2b8e7e36bfba8b671ab" + dependencies = [ + "cairo-rs", + "field-offset", +@@ -1202,23 +1215,21 @@ dependencies = [ + + [[package]] + name = "gtk4-macros" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" ++checksum = "ec655a7ef88d8ce9592899deb8b2d0fa50bab1e6dd69182deb764e643c522408" + dependencies = [ +- "anyhow", + "proc-macro-crate", +- "proc-macro-error", + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "gtk4-sys" +-version = "0.8.1" ++version = "0.8.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" ++checksum = "8c8aa86b7f85ea71d66ea88c1d4bae1cfacf51ca4856274565133838d77e57b5" + dependencies = [ + "cairo-sys-rs", + "gdk-pixbuf-sys", +@@ -1235,24 +1246,19 @@ dependencies = [ + + [[package]] + name = "half" +-version = "2.2.1" ++version = "2.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0" ++checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9" + dependencies = [ ++ "cfg-if", + "crunchy", + ] + + [[package]] + name = "hashbrown" +-version = "0.14.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +- +-[[package]] +-name = "heck" +-version = "0.4.0" ++version = "0.15.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" ++checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" + + [[package]] + name = "heck" +@@ -1269,6 +1275,12 @@ dependencies = [ + "libc", + ] + ++[[package]] ++name = "hermit-abi" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" ++ + [[package]] + name = "hkdf" + version = "0.10.0" +@@ -1300,30 +1312,29 @@ dependencies = [ + "markup5ever", + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] + name = "http" +-version = "0.2.6" ++version = "0.2.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "31f4c6746584866f0feabcc69893c5b51beef3831656a968ed7ae254cdc4fd03" ++checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" + dependencies = [ +- "bytes 1.1.0", ++ "bytes 1.10.1", + "fnv", +- "itoa 1.0.1", ++ "itoa 1.0.15", + ] + + [[package]] + name = "http-client" +-version = "6.5.1" ++version = "6.5.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea880b03c18a7e981d7fb3608b8904a98425d53c440758fcebf7d934aa56547c" ++checksum = "1947510dc91e2bf586ea5ffb412caad7673264e14bb39fb9078da114a94ce1a5" + dependencies = [ + "async-std", + "async-trait", + "cfg-if", +- "dashmap", + "http-types", + "isahc", + "log", +@@ -1336,11 +1347,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" + dependencies = [ + "anyhow", +- "async-channel", ++ "async-channel 1.9.0", + "async-std", + "base64", + "cookie", +- "futures-lite", ++ "futures-lite 1.13.0", + "infer", + "pin-project-lite", + "rand 0.7.3", +@@ -1353,9 +1364,9 @@ dependencies = [ + + [[package]] + name = "human_bytes" +-version = "0.4.1" ++version = "0.4.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "39b528196c838e8b3da8b665e08c30958a6f2ede91d79f2ffcd0d4664b9c64eb" ++checksum = "91f255a4535024abf7640cb288260811fc14794f62b063652ed349f9a6c2348e" + + [[package]] + name = "humantime" +@@ -1367,95 +1378,222 @@ dependencies = [ + ] + + [[package]] +-name = "idna" +-version = "0.2.3" ++name = "icu_collections" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" ++checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" + dependencies = [ +- "matches", +- "unicode-bidi", +- "unicode-normalization", ++ "displaydoc", ++ "yoke", ++ "zerofrom", ++ "zerovec", + ] + + [[package]] +-name = "im-rc" +-version = "15.1.0" ++name = "icu_locid" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" ++checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" + dependencies = [ +- "bitmaps", +- "rand_core 0.6.3", +- "rand_xoshiro", +- "sized-chunks", +- "typenum", +- "version_check", ++ "displaydoc", ++ "litemap", ++ "tinystr", ++ "writeable", ++ "zerovec", + ] + + [[package]] +-name = "image" +-version = "0.24.5" ++name = "icu_locid_transform" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" ++checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" + dependencies = [ +- "bytemuck", +- "byteorder", +- "color_quant", +- "exr", +- "gif", +- "jpeg-decoder", +- "num-rational", +- "num-traits", +- "png", +- "scoped_threadpool", +- "tiff", ++ "displaydoc", ++ "icu_locid", ++ "icu_locid_transform_data", ++ "icu_provider", ++ "tinystr", ++ "zerovec", + ] + + [[package]] +-name = "indexmap" +-version = "2.2.5" ++name = "icu_locid_transform_data" ++version = "1.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7515e6d781098bf9f7205ab3fc7e9709d34554ae0b21ddbcb5febfa4bc7df11d" ++ ++[[package]] ++name = "icu_normalizer" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" ++checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" + dependencies = [ +- "equivalent", +- "hashbrown", ++ "displaydoc", ++ "icu_collections", ++ "icu_normalizer_data", ++ "icu_properties", ++ "icu_provider", ++ "smallvec", ++ "utf16_iter", ++ "utf8_iter", ++ "write16", ++ "zerovec", + ] + + [[package]] +-name = "infer" +-version = "0.2.3" ++name = "icu_normalizer_data" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" ++checksum = "c5e8338228bdc8ab83303f16b797e177953730f601a96c25d10cb3ab0daa0cb7" + + [[package]] +-name = "instant" +-version = "0.1.12" ++name = "icu_properties" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" ++checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" + dependencies = [ +- "cfg-if", ++ "displaydoc", ++ "icu_collections", ++ "icu_locid_transform", ++ "icu_properties_data", ++ "icu_provider", ++ "tinystr", ++ "zerovec", + ] + + [[package]] +-name = "isahc" +-version = "0.9.14" ++name = "icu_properties_data" ++version = "1.5.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" ++checksum = "85fb8799753b75aee8d2a21d7c14d9f38921b54b3dbda10f5a3c7a7b82dba5e2" ++ ++[[package]] ++name = "icu_provider" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" + dependencies = [ +- "bytes 0.5.6", +- "crossbeam-utils", +- "curl", +- "curl-sys", +- "flume 0.9.2", +- "futures-lite", +- "http", +- "log", +- "once_cell", +- "slab", +- "sluice", +- "tracing", +- "tracing-futures", +- "url", +- "waker-fn", ++ "displaydoc", ++ "icu_locid", ++ "icu_provider_macros", ++ "stable_deref_trait", ++ "tinystr", ++ "writeable", ++ "yoke", ++ "zerofrom", ++ "zerovec", ++] ++ ++[[package]] ++name = "icu_provider_macros" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "idna" ++version = "1.0.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" ++dependencies = [ ++ "idna_adapter", ++ "smallvec", ++ "utf8_iter", ++] ++ ++[[package]] ++name = "idna_adapter" ++version = "1.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" ++dependencies = [ ++ "icu_normalizer", ++ "icu_properties", ++] ++ ++[[package]] ++name = "im-rc" ++version = "15.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "af1955a75fa080c677d3972822ec4bad316169ab1cfc6c257a942c2265dbe5fe" ++dependencies = [ ++ "bitmaps", ++ "rand_core 0.6.4", ++ "rand_xoshiro", ++ "sized-chunks", ++ "typenum", ++ "version_check", ++] ++ ++[[package]] ++name = "image" ++version = "0.24.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5690139d2f55868e080017335e4b94cb7414274c74f1669c84fb5feba2c9f69d" ++dependencies = [ ++ "bytemuck", ++ "byteorder", ++ "color_quant", ++ "exr", ++ "gif", ++ "jpeg-decoder", ++ "num-traits", ++ "png", ++ "qoi", ++ "tiff", ++] ++ ++[[package]] ++name = "indexmap" ++version = "2.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" ++dependencies = [ ++ "equivalent", ++ "hashbrown", ++] ++ ++[[package]] ++name = "infer" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" ++ ++[[package]] ++name = "instant" ++version = "0.1.13" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" ++dependencies = [ ++ "cfg-if", ++] ++ ++[[package]] ++name = "isahc" ++version = "0.9.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2948a0ce43e2c2ef11d7edf6816508998d99e13badd1150be0914205df9388a" ++dependencies = [ ++ "bytes 0.5.6", ++ "crossbeam-utils", ++ "curl", ++ "curl-sys", ++ "flume", ++ "futures-lite 1.13.0", ++ "http", ++ "log", ++ "once_cell", ++ "slab", ++ "sluice", ++ "tracing", ++ "tracing-futures", ++ "url", ++ "waker-fn", + ] + + [[package]] +@@ -1466,25 +1604,26 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" + + [[package]] + name = "itoa" +-version = "1.0.1" ++version = "1.0.15" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35" ++checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" + + [[package]] + name = "jpeg-decoder" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" ++checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" + dependencies = [ + "rayon", + ] + + [[package]] + name = "js-sys" +-version = "0.3.56" ++version = "0.3.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" ++checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" + dependencies = [ ++ "once_cell", + "wasm-bindgen", + ] + +@@ -1499,9 +1638,9 @@ dependencies = [ + + [[package]] + name = "lazy_static" +-version = "1.4.0" ++version = "1.5.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" + + [[package]] + name = "lebe" +@@ -1543,15 +1682,15 @@ dependencies = [ + + [[package]] + name = "libc" +-version = "0.2.121" ++version = "0.2.172" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" ++checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" + + [[package]] + name = "libnghttp2-sys" +-version = "0.1.7+1.45.0" ++version = "0.1.11+1.64.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "57ed28aba195b38d5ff02b9170cbff627e336a20925e43b4945390401c5dc93f" ++checksum = "1b6c24e48a7167cffa7119da39d577fa482e66c688a4aac016bee862e1a713c4" + dependencies = [ + "cc", + "libc", +@@ -1559,9 +1698,9 @@ dependencies = [ + + [[package]] + name = "libz-sys" +-version = "1.1.5" ++version = "1.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6f35facd4a5673cb5a48822be2be1d4236c1c99cb4113cab7061ac720d5bf859" ++checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d" + dependencies = [ + "cc", + "libc", +@@ -1569,6 +1708,18 @@ dependencies = [ + "vcpkg", + ] + ++[[package]] ++name = "linux-raw-sys" ++version = "0.4.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" ++ ++[[package]] ++name = "litemap" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856" ++ + [[package]] + name = "locale_config" + version = "0.3.0" +@@ -1584,20 +1735,20 @@ dependencies = [ + + [[package]] + name = "lock_api" +-version = "0.4.6" ++version = "0.4.12" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" ++checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" + dependencies = [ ++ "autocfg", + "scopeguard", + ] + + [[package]] + name = "log" +-version = "0.4.16" ++version = "0.4.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" ++checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" + dependencies = [ +- "cfg-if", + "value-bag", + ] + +@@ -1632,36 +1783,36 @@ dependencies = [ + + [[package]] + name = "matches" +-version = "0.1.9" ++version = "0.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" ++checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" + + [[package]] + name = "memchr" +-version = "2.7.1" ++version = "2.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" ++checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + + [[package]] + name = "memoffset" +-version = "0.6.5" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" ++checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" + dependencies = [ + "autocfg", + ] + + [[package]] + name = "mime" +-version = "0.3.16" ++version = "0.3.17" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" ++checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + + [[package]] + name = "mime_guess" +-version = "2.0.4" ++version = "2.0.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef" ++checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" + dependencies = [ + "mime", + "unicase", +@@ -1669,27 +1820,19 @@ dependencies = [ + + [[package]] + name = "miniz_oxide" +-version = "0.6.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +-dependencies = [ +- "adler", +-] +- +-[[package]] +-name = "nanorand" +-version = "0.7.0" ++version = "0.8.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" ++checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" + dependencies = [ +- "getrandom 0.2.6", ++ "adler2", ++ "simd-adler32", + ] + + [[package]] + name = "new_debug_unreachable" +-version = "1.0.4" ++version = "1.0.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" ++checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" + + [[package]] + name = "nodrop" +@@ -1697,46 +1840,15 @@ version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" + +-[[package]] +-name = "num-integer" +-version = "0.1.44" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +-dependencies = [ +- "autocfg", +- "num-traits", +-] +- +-[[package]] +-name = "num-rational" +-version = "0.4.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +-dependencies = [ +- "autocfg", +- "num-integer", +- "num-traits", +-] +- + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] + +-[[package]] +-name = "num_cpus" +-version = "1.13.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +-dependencies = [ +- "hermit-abi", +- "libc", +-] +- + [[package]] + name = "objc" + version = "0.2.7" +@@ -1768,29 +1880,28 @@ dependencies = [ + + [[package]] + name = "once_cell" +-version = "1.10.0" ++version = "1.21.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" ++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" + + [[package]] + name = "opaque-debug" +-version = "0.3.0" ++version = "0.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" ++checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" + + [[package]] + name = "openssl-probe" +-version = "0.1.5" ++version = "0.1.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" ++checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e" + + [[package]] + name = "openssl-sys" +-version = "0.9.72" ++version = "0.9.107" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" ++checksum = "8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07" + dependencies = [ +- "autocfg", + "cc", + "libc", + "pkg-config", +@@ -1799,9 +1910,9 @@ dependencies = [ + + [[package]] + name = "pango" +-version = "0.19.3" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b1264d13deb823cc652f26cfe59afb1ec4b9db2a5bd27c41b738c879cc1bfaa1" ++checksum = "3f0d328648058085cfd6897c9ae4272884098a926f3a833cd50c8c73e6eccecd" + dependencies = [ + "gio", + "glib", +@@ -1811,9 +1922,9 @@ dependencies = [ + + [[package]] + name = "pango-sys" +-version = "0.19.0" ++version = "0.19.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f52ef6a881c19fbfe3b1484df5cad411acaaba29dbec843941c3110d19f340ea" ++checksum = "ff03da4fa086c0b244d4a4587d3e20622a3ecdb21daea9edf66597224c634ba0" + dependencies = [ + "glib-sys", + "gobject-sys", +@@ -1823,15 +1934,15 @@ dependencies = [ + + [[package]] + name = "parking" +-version = "2.0.0" ++version = "2.2.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" ++checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + + [[package]] + name = "parking_lot" +-version = "0.12.0" ++version = "0.12.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" ++checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" + dependencies = [ + "lock_api", + "parking_lot_core", +@@ -1839,31 +1950,22 @@ dependencies = [ + + [[package]] + name = "parking_lot_core" +-version = "0.9.1" ++version = "0.9.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" ++checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" + dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", +- "windows-sys 0.32.0", ++ "windows-targets", + ] + + [[package]] + name = "percent-encoding" +-version = "2.1.0" ++version = "2.3.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +- +-[[package]] +-name = "pest" +-version = "2.1.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +-dependencies = [ +- "ucd-trie", +-] ++checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + + [[package]] + name = "phf" +@@ -1898,11 +2000,11 @@ dependencies = [ + + [[package]] + name = "phf_generator" +-version = "0.10.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" ++checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" + dependencies = [ +- "phf_shared 0.10.0", ++ "phf_shared 0.11.3", + "rand 0.8.5", + ] + +@@ -1917,7 +2019,7 @@ dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] +@@ -1926,43 +2028,43 @@ version = "0.8.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c00cf8b9eafe68dde5e9eaa2cef8ee84a9336a47d566ec55ca16589633b65af7" + dependencies = [ +- "siphasher", ++ "siphasher 0.3.11", + ] + + [[package]] + name = "phf_shared" +-version = "0.10.0" ++version = "0.11.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" ++checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" + dependencies = [ +- "siphasher", ++ "siphasher 1.0.1", + ] + + [[package]] + name = "pin-project" +-version = "1.0.10" ++version = "1.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" ++checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a" + dependencies = [ + "pin-project-internal", + ] + + [[package]] + name = "pin-project-internal" +-version = "1.0.10" ++version = "1.1.10" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" ++checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "pin-project-lite" +-version = "0.2.8" ++version = "0.2.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" ++checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + + [[package]] + name = "pin-utils" +@@ -1970,35 +2072,49 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + ++[[package]] ++name = "piper" ++version = "0.2.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066" ++dependencies = [ ++ "atomic-waker", ++ "fastrand 2.3.0", ++ "futures-io", ++] ++ + [[package]] + name = "pkg-config" +-version = "0.3.30" ++version = "0.3.32" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" ++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" + + [[package]] + name = "png" +-version = "0.17.7" ++version = "0.17.16" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" ++checksum = "82151a2fc869e011c153adc57cf2789ccb8d9906ce52c0b39a6b5697749d7526" + dependencies = [ + "bitflags 1.3.2", + "crc32fast", ++ "fdeflate", + "flate2", + "miniz_oxide", + ] + + [[package]] + name = "polling" +-version = "2.2.0" ++version = "3.7.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "685404d509889fade3e86fe3a5803bca2ec09b0c0778d5ada6ec8bf7a8de5259" ++checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" + dependencies = [ + "cfg-if", +- "libc", +- "log", +- "wepoll-ffi", +- "winapi", ++ "concurrent-queue", ++ "hermit-abi 0.4.0", ++ "pin-project-lite", ++ "rustix", ++ "tracing", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -2014,9 +2130,12 @@ dependencies = [ + + [[package]] + name = "ppv-lite86" +-version = "0.2.16" ++version = "0.2.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" ++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" ++dependencies = [ ++ "zerocopy", ++] + + [[package]] + name = "precomputed-hash" +@@ -2036,50 +2155,35 @@ dependencies = [ + + [[package]] + name = "proc-macro-crate" +-version = "3.1.0" ++version = "3.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" ++checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35" + dependencies = [ + "toml_edit", + ] + + [[package]] +-name = "proc-macro-error" +-version = "1.0.4" ++name = "proc-macro-hack" ++version = "0.5.20+deprecated" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +-dependencies = [ +- "proc-macro-error-attr", +- "proc-macro2", +- "quote", +- "syn 1.0.89", +- "version_check", +-] ++checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" + + [[package]] +-name = "proc-macro-error-attr" +-version = "1.0.4" ++name = "proc-macro2" ++version = "1.0.95" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" ++checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" + dependencies = [ +- "proc-macro2", +- "quote", +- "version_check", ++ "unicode-ident", + ] + + [[package]] +-name = "proc-macro-hack" +-version = "0.5.19" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" +- +-[[package]] +-name = "proc-macro2" +-version = "1.0.79" ++name = "qoi" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" ++checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001" + dependencies = [ +- "unicode-ident", ++ "bytemuck", + ] + + [[package]] +@@ -2090,9 +2194,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" + + [[package]] + name = "quote" +-version = "1.0.35" ++version = "1.0.40" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" ++checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" + dependencies = [ + "proc-macro2", + ] +@@ -2119,7 +2223,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" + dependencies = [ + "libc", + "rand_chacha 0.3.1", +- "rand_core 0.6.3", ++ "rand_core 0.6.4", + ] + + [[package]] +@@ -2139,7 +2243,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" + dependencies = [ + "ppv-lite86", +- "rand_core 0.6.3", ++ "rand_core 0.6.4", + ] + + [[package]] +@@ -2153,11 +2257,11 @@ dependencies = [ + + [[package]] + name = "rand_core" +-version = "0.6.3" ++version = "0.6.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" ++checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" + dependencies = [ +- "getrandom 0.2.6", ++ "getrandom 0.2.16", + ] + + [[package]] +@@ -2184,48 +2288,55 @@ version = "0.6.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" + dependencies = [ +- "rand_core 0.6.3", ++ "rand_core 0.6.4", + ] + + [[package]] + name = "rayon" +-version = "1.5.1" ++version = "1.10.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" ++checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" + dependencies = [ +- "autocfg", +- "crossbeam-deque", + "either", + "rayon-core", + ] + + [[package]] + name = "rayon-core" +-version = "1.9.1" ++version = "1.12.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" ++checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" + dependencies = [ +- "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", +- "lazy_static", +- "num_cpus", + ] + + [[package]] + name = "redox_syscall" +-version = "0.2.12" ++version = "0.5.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ae183fc1b06c149f0c1793e1eb447c8b04bfe46d48e9e48bfb8d2d7ed64ecf0" ++checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3" + dependencies = [ +- "bitflags 1.3.2", ++ "bitflags 2.9.0", + ] + + [[package]] + name = "regex" +-version = "1.5.5" ++version = "1.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" ++dependencies = [ ++ "aho-corasick", ++ "memchr", ++ "regex-automata", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" ++checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" + dependencies = [ + "aho-corasick", + "memchr", +@@ -2234,9 +2345,9 @@ dependencies = [ + + [[package]] + name = "regex-syntax" +-version = "0.6.25" ++version = "0.8.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" ++checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" + + [[package]] + name = "rustc_version" +@@ -2249,49 +2360,52 @@ dependencies = [ + + [[package]] + name = "rustc_version" +-version = "0.3.3" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" ++checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" + dependencies = [ +- "semver 0.11.0", ++ "semver 1.0.26", + ] + + [[package]] +-name = "rustc_version" +-version = "0.4.0" ++name = "rustix" ++version = "0.38.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" ++checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" + dependencies = [ +- "semver 1.0.7", ++ "bitflags 2.9.0", ++ "errno", ++ "libc", ++ "linux-raw-sys", ++ "windows-sys 0.59.0", + ] + ++[[package]] ++name = "rustversion" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2" ++ + [[package]] + name = "ryu" +-version = "1.0.9" ++version = "1.0.20" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f" ++checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" + + [[package]] + name = "schannel" +-version = "0.1.19" ++version = "0.1.27" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" ++checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d" + dependencies = [ +- "lazy_static", +- "winapi", ++ "windows-sys 0.59.0", + ] + +-[[package]] +-name = "scoped_threadpool" +-version = "0.1.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" +- + [[package]] + name = "scopeguard" +-version = "1.1.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + + [[package]] + name = "scraper" +@@ -2335,23 +2449,14 @@ version = "0.9.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" + dependencies = [ +- "semver-parser 0.7.0", ++ "semver-parser", + ] + + [[package]] + name = "semver" +-version = "0.11.0" ++version = "1.0.26" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" +-dependencies = [ +- "semver-parser 0.10.2", +-] +- +-[[package]] +-name = "semver" +-version = "1.0.7" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" ++checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0" + + [[package]] + name = "semver-parser" +@@ -2359,42 +2464,34 @@ version = "0.7.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + +-[[package]] +-name = "semver-parser" +-version = "0.10.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" +-dependencies = [ +- "pest", +-] +- + [[package]] + name = "serde" +-version = "1.0.136" ++version = "1.0.219" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" ++checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" + dependencies = [ + "serde_derive", + ] + + [[package]] + name = "serde_derive" +-version = "1.0.136" ++version = "1.0.219" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" ++checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "serde_json" +-version = "1.0.79" ++version = "1.0.140" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" ++checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" + dependencies = [ +- "itoa 1.0.1", ++ "itoa 1.0.15", ++ "memchr", + "ryu", + "serde", + ] +@@ -2410,6 +2507,15 @@ dependencies = [ + "thiserror", + ] + ++[[package]] ++name = "serde_spanned" ++version = "0.6.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" ++dependencies = [ ++ "serde", ++] ++ + [[package]] + name = "serde_urlencoded" + version = "0.7.1" +@@ -2417,7 +2523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" + dependencies = [ + "form_urlencoded", +- "itoa 1.0.1", ++ "itoa 1.0.15", + "ryu", + "serde", + ] +@@ -2443,9 +2549,9 @@ dependencies = [ + + [[package]] + name = "sha1_smol" +-version = "1.0.0" ++version = "1.0.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" ++checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" + + [[package]] + name = "sha2" +@@ -2481,17 +2587,29 @@ dependencies = [ + "url", + ] + ++[[package]] ++name = "shlex" ++version = "1.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" ++ + [[package]] + name = "simd-adler32" +-version = "0.3.4" ++version = "0.3.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "14a5df39617d7c8558154693a1bb8157a4aab8179209540cc0b10e5dc24e0b18" ++checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + + [[package]] + name = "siphasher" +-version = "0.3.10" ++version = "0.3.11" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" ++checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" ++ ++[[package]] ++name = "siphasher" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + + [[package]] + name = "sized-chunks" +@@ -2505,9 +2623,12 @@ dependencies = [ + + [[package]] + name = "slab" +-version = "0.4.5" ++version = "0.4.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" ++checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" ++dependencies = [ ++ "autocfg", ++] + + [[package]] + name = "sluice" +@@ -2515,41 +2636,32 @@ version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "6d7400c0eff44aa2fcb5e31a5f24ba9716ed90138769e4977a2ba6014ae63eb5" + dependencies = [ +- "async-channel", ++ "async-channel 1.9.0", + "futures-core", + "futures-io", + ] + + [[package]] + name = "smallvec" +-version = "1.13.2" ++version = "1.15.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" ++checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" + + [[package]] + name = "socket2" +-version = "0.4.4" ++version = "0.5.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" ++checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef" + dependencies = [ + "libc", +- "winapi", +-] +- +-[[package]] +-name = "spin" +-version = "0.9.5" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" +-dependencies = [ +- "lock_api", ++ "windows-sys 0.52.0", + ] + + [[package]] + name = "spinning_top" +-version = "0.2.4" ++version = "0.2.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" ++checksum = "5b9eb1a2f4c41445a3a0ff9abc5221c5fcd28e1f13cd7c0397706f9ac938ddb0" + dependencies = [ + "lock_api", + ] +@@ -2593,7 +2705,7 @@ dependencies = [ + "quote", + "serde", + "serde_derive", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2609,7 +2721,7 @@ dependencies = [ + "serde_derive", + "serde_json", + "sha1", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] +@@ -2620,26 +2732,25 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + + [[package]] + name = "string_cache" +-version = "0.8.4" ++version = "0.8.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "213494b7a2b503146286049378ce02b482200519accc31872ee8be91fa820a08" ++checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" + dependencies = [ + "new_debug_unreachable", +- "once_cell", + "parking_lot", +- "phf_shared 0.10.0", ++ "phf_shared 0.11.3", + "precomputed-hash", + "serde", + ] + + [[package]] + name = "string_cache_codegen" +-version = "0.5.2" ++version = "0.5.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988" ++checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" + dependencies = [ +- "phf_generator 0.10.0", +- "phf_shared 0.10.0", ++ "phf_generator 0.11.3", ++ "phf_shared 0.11.3", + "proc-macro2", + "quote", + ] +@@ -2661,7 +2772,7 @@ dependencies = [ + "cfg-if", + "encoding_rs", + "futures-util", +- "getrandom 0.2.6", ++ "getrandom 0.2.16", + "http-client", + "http-types", + "log", +@@ -2675,44 +2786,61 @@ dependencies = [ + + [[package]] + name = "syn" +-version = "1.0.89" ++version = "1.0.109" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" ++checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" + dependencies = [ + "proc-macro2", + "quote", +- "unicode-xid", ++ "unicode-ident", + ] + + [[package]] + name = "syn" +-version = "2.0.53" ++version = "2.0.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" ++checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" + dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", + ] + ++[[package]] ++name = "synstructure" ++version = "0.13.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ + [[package]] + name = "system-deps" +-version = "6.0.2" ++version = "6.2.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a1a45a1c4c9015217e12347f2a411b57ce2c4fc543913b14b6fe40483328e709" ++checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349" + dependencies = [ + "cfg-expr", +- "heck 0.4.0", ++ "heck", + "pkg-config", + "toml", + "version-compare", + ] + ++[[package]] ++name = "target-lexicon" ++version = "0.12.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" ++ + [[package]] + name = "temp-dir" +-version = "0.1.11" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "af547b166dd1ea4b472165569fc456cfb6818116f854690b0ff205e636523dab" ++checksum = "bc1ee6eef34f12f765cb94725905c6312b6610ab2b0940889cfe58dae7bc3c72" + + [[package]] + name = "tendril" +@@ -2727,9 +2855,9 @@ dependencies = [ + + [[package]] + name = "termcolor" +-version = "1.1.3" ++version = "1.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" ++checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" + dependencies = [ + "winapi-util", + ] +@@ -2742,38 +2870,29 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" + + [[package]] + name = "thiserror" +-version = "1.0.30" ++version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" ++checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" + dependencies = [ + "thiserror-impl", + ] + + [[package]] + name = "thiserror-impl" +-version = "1.0.30" ++version = "1.0.69" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" ++checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", +-] +- +-[[package]] +-name = "threadpool" +-version = "1.8.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" +-dependencies = [ +- "num_cpus", ++ "syn 2.0.100", + ] + + [[package]] + name = "tiff" +-version = "0.8.1" ++version = "0.9.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" ++checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e" + dependencies = [ + "flate2", + "jpeg-decoder", +@@ -2815,57 +2934,59 @@ dependencies = [ + "proc-macro2", + "quote", + "standback", +- "syn 1.0.89", ++ "syn 1.0.109", + ] + + [[package]] +-name = "tinyvec" +-version = "1.5.1" ++name = "tinystr" ++version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" ++checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" + dependencies = [ +- "tinyvec_macros", ++ "displaydoc", ++ "zerovec", + ] + +-[[package]] +-name = "tinyvec_macros" +-version = "0.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +- + [[package]] + name = "toml" +-version = "0.5.8" ++version = "0.8.21" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" ++checksum = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231" + dependencies = [ + "serde", ++ "serde_spanned", ++ "toml_datetime", ++ "toml_edit", + ] + + [[package]] + name = "toml_datetime" +-version = "0.6.5" ++version = "0.6.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" ++checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3" ++dependencies = [ ++ "serde", ++] + + [[package]] + name = "toml_edit" +-version = "0.21.1" ++version = "0.22.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" ++checksum = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485" + dependencies = [ + "indexmap", ++ "serde", ++ "serde_spanned", + "toml_datetime", + "winnow", + ] + + [[package]] + name = "tracing" +-version = "0.1.32" ++version = "0.1.41" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" ++checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" + dependencies = [ +- "cfg-if", + "log", + "pin-project-lite", + "tracing-attributes", +@@ -2874,22 +2995,22 @@ dependencies = [ + + [[package]] + name = "tracing-attributes" +-version = "0.1.20" ++version = "0.1.28" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" ++checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + ] + + [[package]] + name = "tracing-core" +-version = "0.1.23" ++version = "0.1.33" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" ++checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" + dependencies = [ +- "lazy_static", ++ "once_cell", + ] + + [[package]] +@@ -2904,57 +3025,27 @@ dependencies = [ + + [[package]] + name = "typenum" +-version = "1.15.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" +- +-[[package]] +-name = "ucd-trie" +-version = "0.1.3" ++version = "1.18.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" ++checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f" + + [[package]] + name = "unicase" +-version = "2.6.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +-dependencies = [ +- "version_check", +-] +- +-[[package]] +-name = "unicode-bidi" +-version = "0.3.7" ++version = "2.8.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" ++checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539" + + [[package]] + name = "unicode-ident" +-version = "1.0.11" ++version = "1.0.18" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +- +-[[package]] +-name = "unicode-normalization" +-version = "0.1.19" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +-dependencies = [ +- "tinyvec", +-] ++checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" + + [[package]] + name = "unicode-width" +-version = "0.1.9" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +- +-[[package]] +-name = "unicode-xid" +-version = "0.2.2" ++version = "0.1.14" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" ++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" + + [[package]] + name = "universal-hash" +@@ -2968,13 +3059,12 @@ dependencies = [ + + [[package]] + name = "url" +-version = "2.2.2" ++version = "2.5.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" ++checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" + dependencies = [ + "form_urlencoded", + "idna", +- "matches", + "percent-encoding", + "serde", + ] +@@ -2985,15 +3075,23 @@ version = "0.7.6" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + ++[[package]] ++name = "utf16_iter" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" ++ ++[[package]] ++name = "utf8_iter" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" ++ + [[package]] + name = "value-bag" +-version = "1.0.0-alpha.8" ++version = "1.11.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" +-dependencies = [ +- "ctor", +- "version_check", +-] ++checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5" + + [[package]] + name = "vcpkg" +@@ -3003,21 +3101,21 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" + + [[package]] + name = "version-compare" +-version = "0.1.0" ++version = "0.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73" ++checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b" + + [[package]] + name = "version_check" +-version = "0.9.4" ++version = "0.9.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" ++checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + + [[package]] + name = "waker-fn" +-version = "1.1.0" ++version = "1.2.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" ++checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7" + + [[package]] + name = "wasi" +@@ -3027,52 +3125,54 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + + [[package]] + name = "wasi" +-version = "0.10.2+wasi-snapshot-preview1" ++version = "0.11.0+wasi-snapshot-preview1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + + [[package]] + name = "wasm-bindgen" +-version = "0.2.79" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" ++checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" + dependencies = [ + "cfg-if", ++ "once_cell", ++ "rustversion", + "wasm-bindgen-macro", + ] + + [[package]] + name = "wasm-bindgen-backend" +-version = "0.2.79" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" ++checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" + dependencies = [ + "bumpalo", +- "lazy_static", + "log", + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-futures" +-version = "0.4.29" ++version = "0.4.50" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" ++checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" + dependencies = [ + "cfg-if", + "js-sys", ++ "once_cell", + "wasm-bindgen", + "web-sys", + ] + + [[package]] + name = "wasm-bindgen-macro" +-version = "0.2.79" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" ++checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" + dependencies = [ + "quote", + "wasm-bindgen-macro-support", +@@ -3080,28 +3180,31 @@ dependencies = [ + + [[package]] + name = "wasm-bindgen-macro-support" +-version = "0.2.79" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" ++checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" + dependencies = [ + "proc-macro2", + "quote", +- "syn 1.0.89", ++ "syn 2.0.100", + "wasm-bindgen-backend", + "wasm-bindgen-shared", + ] + + [[package]] + name = "wasm-bindgen-shared" +-version = "0.2.79" ++version = "0.2.100" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" ++checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" ++dependencies = [ ++ "unicode-ident", ++] + + [[package]] + name = "web-sys" +-version = "0.3.56" ++version = "0.3.77" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" ++checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" + dependencies = [ + "js-sys", + "wasm-bindgen", +@@ -3109,18 +3212,9 @@ dependencies = [ + + [[package]] + name = "weezl" +-version = "0.1.5" ++version = "0.1.8" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e" +- +-[[package]] +-name = "wepoll-ffi" +-version = "0.1.2" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" +-dependencies = [ +- "cc", +-] ++checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" + + [[package]] + name = "winapi" +@@ -3140,11 +3234,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + + [[package]] + name = "winapi-util" +-version = "0.1.5" ++version = "0.1.9" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" + dependencies = [ +- "winapi", ++ "windows-sys 0.59.0", + ] + + [[package]] +@@ -3155,127 +3249,199 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + + [[package]] + name = "windows-sys" +-version = "0.32.0" ++version = "0.52.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" ++checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" + dependencies = [ +- "windows_aarch64_msvc 0.32.0", +- "windows_i686_gnu 0.32.0", +- "windows_i686_msvc 0.32.0", +- "windows_x86_64_gnu 0.32.0", +- "windows_x86_64_msvc 0.32.0", ++ "windows-targets", + ] + + [[package]] + name = "windows-sys" +-version = "0.52.0" ++version = "0.59.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" ++checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" + dependencies = [ + "windows-targets", + ] + + [[package]] + name = "windows-targets" +-version = "0.52.4" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" ++checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" + dependencies = [ + "windows_aarch64_gnullvm", +- "windows_aarch64_msvc 0.52.4", +- "windows_i686_gnu 0.52.4", +- "windows_i686_msvc 0.52.4", +- "windows_x86_64_gnu 0.52.4", ++ "windows_aarch64_msvc", ++ "windows_i686_gnu", ++ "windows_i686_gnullvm", ++ "windows_i686_msvc", ++ "windows_x86_64_gnu", + "windows_x86_64_gnullvm", +- "windows_x86_64_msvc 0.52.4", ++ "windows_x86_64_msvc", + ] + + [[package]] + name = "windows_aarch64_gnullvm" +-version = "0.52.4" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" ++checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + + [[package]] + name = "windows_aarch64_msvc" +-version = "0.32.0" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" ++checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + + [[package]] +-name = "windows_aarch64_msvc" +-version = "0.52.4" ++name = "windows_i686_gnu" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" ++checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + + [[package]] +-name = "windows_i686_gnu" +-version = "0.32.0" ++name = "windows_i686_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" ++checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + + [[package]] +-name = "windows_i686_gnu" +-version = "0.52.4" ++name = "windows_i686_msvc" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" ++checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + + [[package]] +-name = "windows_i686_msvc" +-version = "0.32.0" ++name = "windows_x86_64_gnu" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" ++checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + + [[package]] +-name = "windows_i686_msvc" +-version = "0.52.4" ++name = "windows_x86_64_gnullvm" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" ++checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + + [[package]] +-name = "windows_x86_64_gnu" +-version = "0.32.0" ++name = "windows_x86_64_msvc" ++version = "0.52.6" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" ++checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + + [[package]] +-name = "windows_x86_64_gnu" +-version = "0.52.4" ++name = "winnow" ++version = "0.7.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" ++checksum = "6cb8234a863ea0e8cd7284fcdd4f145233eb00fee02bbdd9861aec44e6477bc5" ++dependencies = [ ++ "memchr", ++] + + [[package]] +-name = "windows_x86_64_gnullvm" +-version = "0.52.4" ++name = "write16" ++version = "1.0.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" ++checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + + [[package]] +-name = "windows_x86_64_msvc" +-version = "0.32.0" ++name = "writeable" ++version = "0.5.5" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" ++checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + + [[package]] +-name = "windows_x86_64_msvc" +-version = "0.52.4" ++name = "yoke" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" ++dependencies = [ ++ "serde", ++ "stable_deref_trait", ++ "yoke-derive", ++ "zerofrom", ++] ++ ++[[package]] ++name = "yoke-derive" ++version = "0.7.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++ "synstructure", ++] ++ ++[[package]] ++name = "zerocopy" ++version = "0.8.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" ++checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" ++dependencies = [ ++ "zerocopy-derive", ++] + + [[package]] +-name = "winnow" +-version = "0.5.40" ++name = "zerocopy-derive" ++version = "0.8.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" ++checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" + dependencies = [ +- "memchr", ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++] ++ ++[[package]] ++name = "zerofrom" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5" ++dependencies = [ ++ "zerofrom-derive", ++] ++ ++[[package]] ++name = "zerofrom-derive" ++version = "0.1.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", ++ "synstructure", ++] ++ ++[[package]] ++name = "zerovec" ++version = "0.10.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" ++dependencies = [ ++ "yoke", ++ "zerofrom", ++ "zerovec-derive", ++] ++ ++[[package]] ++name = "zerovec-derive" ++version = "0.10.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn 2.0.100", + ] + + [[package]] + name = "zune-inflate" +-version = "0.2.50" ++version = "0.2.54" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "589245df6230839c305984dcc0a8385cc72af1fd223f360ffd5d65efa4216d40" ++checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02" + dependencies = [ + "simd-adler32", + ] diff --git a/pkgs/by-name/st/stylelint/package.nix b/pkgs/by-name/st/stylelint/package.nix index 12074664729a..2e823ab8d35f 100644 --- a/pkgs/by-name/st/stylelint/package.nix +++ b/pkgs/by-name/st/stylelint/package.nix @@ -5,16 +5,16 @@ }: buildNpmPackage rec { pname = "stylelint"; - version = "16.19.0"; + version = "16.19.1"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; tag = version; - hash = "sha256-mQQhO63zX69ke7774t4YYpKTC4JHKBFFOlE8ovJYhco="; + hash = "sha256-KYUNKA/KJXfRiGkhzkBKkiuEMJAwpkt4FXwx/oJQdq4="; }; - npmDepsHash = "sha256-dx5FQsiL6XtsJh8wYq+q8j4n/vwlr0U0HpZqLwbIAXY="; + npmDepsHash = "sha256-5KWs4AboLHJBXJaDXAs30e0e9PAncFQzGHdNDxG8Lpo="; dontNpmBuild = true; diff --git a/pkgs/by-name/ti/tile-downloader/package.nix b/pkgs/by-name/ti/tile-downloader/package.nix new file mode 100644 index 000000000000..6bd03ea45222 --- /dev/null +++ b/pkgs/by-name/ti/tile-downloader/package.nix @@ -0,0 +1,46 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + nix-update-script, + openssl, + pkg-config, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "tile-downloader"; + version = "0.1.0"; + + src = fetchFromGitLab { + domain = "gitlab.scd31.com"; + owner = "stephen"; + repo = "tile-downloader"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+FnLGMUGyuaN7uPRvuounDKwF6pV9NKv3r/ajdKtdCE="; + }; + + cargoHash = "sha256-jKNp+YJKZ3qpaDzwi3DvFaZAipRhm1+sTtKBtQEj7qI="; + + passthru = { + updateScript = nix-update-script { }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + openssl + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Multi-threaded raster tile downloader, primarily designed for downloading OSM tiles for usage offline"; + mainProgram = "tile-downloader"; + homepage = "https://gitlab.scd31.com/stephen/tile-downloader"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ scd31 ]; + }; +}) diff --git a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix b/pkgs/by-name/tw/twitch-tui/package.nix similarity index 73% rename from pkgs/applications/networking/instant-messengers/twitch-tui/default.nix rename to pkgs/by-name/tw/twitch-tui/package.nix index 94a04fc5bcd6..1d7f03d60ecc 100644 --- a/pkgs/applications/networking/instant-messengers/twitch-tui/default.nix +++ b/pkgs/by-name/tw/twitch-tui/package.nix @@ -6,14 +6,14 @@ openssl, }: -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "twitch-tui"; version = "2.6.19"; src = fetchFromGitHub { owner = "Xithrius"; - repo = pname; - tag = "v${version}"; + repo = "twitch-tui"; + tag = "v${finalAttrs.version}"; hash = "sha256-hA66YcxbQem9ymOu3tGA4biKUCoJ2jKnUSK+9+0P2Eg="; }; @@ -28,12 +28,12 @@ rustPlatform.buildRustPackage rec { openssl ]; - meta = with lib; { + meta = { description = "Twitch chat in the terminal"; homepage = "https://github.com/Xithrius/twitch-tui"; - changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${version}"; - license = licenses.mit; - maintainers = [ maintainers.taha ]; + changelog = "https://github.com/Xithrius/twitch-tui/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.lordmzte ]; mainProgram = "twt"; }; -} +}) diff --git a/pkgs/by-name/uc/ucg/package.nix b/pkgs/by-name/uc/ucg/package.nix index 2cf88cebfab6..19a820e35197 100644 --- a/pkgs/by-name/uc/ucg/package.nix +++ b/pkgs/by-name/uc/ucg/package.nix @@ -5,7 +5,7 @@ autoreconfHook, callPackage, pkg-config, - pcre, + pcre2, }: stdenv.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - pcre + pcre2 ]; passthru.tests = { diff --git a/pkgs/by-name/vi/vice/package.nix b/pkgs/by-name/vi/vice/package.nix index 9321531ae43b..d4f68c8569d4 100644 --- a/pkgs/by-name/vi/vice/package.nix +++ b/pkgs/by-name/vi/vice/package.nix @@ -24,6 +24,7 @@ wrapGAppsHook3, xdg-utils, libevdev, + pulseaudio, }: stdenv.mkDerivation rec { @@ -60,6 +61,7 @@ stdenv.mkDerivation rec { xa xdg-utils libevdev + pulseaudio ]; dontDisableStatic = true; configureFlags = [ diff --git a/pkgs/by-name/vi/video-downloader/package.nix b/pkgs/by-name/vi/video-downloader/package.nix index dfc4d49dfc96..2673c702526d 100644 --- a/pkgs/by-name/vi/video-downloader/package.nix +++ b/pkgs/by-name/vi/video-downloader/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication rec { pname = "video-downloader"; - version = "0.12.24"; + version = "0.12.25"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Unrud"; repo = "video-downloader"; tag = "v${version}"; - hash = "sha256-lgHAO4/dqwwp/PiIFHCBRfDNUw0GfomMvfaobakxFdA="; + hash = "sha256-1riIOYXtiC06n2M/eFjsydqrkCvBtrGkHKEJWiTJ8/8="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/pkgs/by-name/vi/vinegar/package.nix b/pkgs/by-name/vi/vinegar/package.nix index 8a6bb7daf1fc..f0b229ce690d 100644 --- a/pkgs/by-name/vi/vinegar/package.nix +++ b/pkgs/by-name/vi/vinegar/package.nix @@ -51,16 +51,20 @@ let hash = "sha256-89wnr2rIbyw490hHwckB9g1GKCXm6BERnplfwEUlNOg="; }) ]; + + postInstall = '' + cp $out/bin/wine $out/bin/wine64 + ''; }); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "vinegar"; version = "1.8.1"; src = fetchFromGitHub { owner = "vinegarhq"; repo = "vinegar"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7rc6LKZx0OOZDedtTpHIQT4grx1FejRiVnJnVDUddy4="; }; @@ -133,7 +137,7 @@ buildGoModule rec { winetricks ] } \ - --prefix PUREGOTK_LIB_FOLDER : ${passthru.libraryPath}/lib + --prefix PUREGOTK_LIB_FOLDER : ${finalAttrs.passthru.libraryPath}/lib ''; passthru = { @@ -155,7 +159,7 @@ buildGoModule rec { }; meta = { - changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${version}"; + changelog = "https://github.com/vinegarhq/vinegar/releases/tag/v${finalAttrs.version}"; description = "Open-source, minimal, configurable, fast bootstrapper for running Roblox Studio on Linux"; homepage = "https://github.com/vinegarhq/vinegar"; license = lib.licenses.gpl3Only; @@ -164,4 +168,4 @@ buildGoModule rec { platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; }; -} +}) diff --git a/pkgs/by-name/xn/xnviewmp/package.nix b/pkgs/by-name/xn/xnviewmp/package.nix new file mode 100644 index 000000000000..d696aa854a81 --- /dev/null +++ b/pkgs/by-name/xn/xnviewmp/package.nix @@ -0,0 +1,67 @@ +{ + appimageTools, + fetchurl, + runCommand, + lib, + makeDesktopItem, + copyDesktopItems, + imagemagick, +}: +let + icon = + runCommand "xnviewmp-icon.png" + { + nativeBuildInputs = [ imagemagick ]; + src = fetchurl { + url = "https://www.xnview.com/img/app-xnsoft-360.webp"; + hash = "sha256-wIzF/WOsPcrYFYC/kGZi6FSJFuErci5EMONjrx1VCdQ="; + }; + } + '' + convert $src $out + ''; +in +appimageTools.wrapType2 rec { + pname = "xnviewmp"; + version = "1.8.8"; + + src = fetchurl { + url = "https://download.xnview.com/old_versions/XnView_MP/XnView_MP-${version}.glibc2.17-x86_64.AppImage"; + hash = "sha256-zPlb2r+oKNq1iv8dAWE/wbXtKAf3A+XOsSOkciHM6OA="; + }; + + nativeBuildInputs = [ + copyDesktopItems + ]; + + desktopItems = [ + (makeDesktopItem { + name = "xnviewmp"; + desktopName = "XnView MP"; + exec = "xnviewmp %F"; + icon = "xnviewmp"; + comment = "An efficient multimedia viewer, browser and converter"; + categories = [ "Graphics" ]; + }) + ]; + + extraPkgs = pkgs: [ + pkgs.qt5.qtbase + ]; + + extraInstallCommands = '' + install -m 444 -D ${icon} $out/share/icons/hicolor/512x512/apps/xnviewmp.png + ''; + + meta = { + description = "Efficient multimedia viewer, browser and converter"; + changelog = "https://www.xnview.com/mantisbt/changelog_page.php"; + homepage = "https://www.xnview.com/en/xnviewmp/"; + downloadPage = "https://download.xnview.com/old_versions/XnView_MP/"; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + license = lib.licenses.unfree; + mainProgram = "xnviewmp"; + maintainers = with lib.maintainers; [ oddlama ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix index e3b31d5be648..d959351e0b24 100644 --- a/pkgs/by-name/yu/yubihsm-shell/package.nix +++ b/pkgs/by-name/yu/yubihsm-shell/package.nix @@ -60,10 +60,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="$(pkg-config --cflags libpcsclite) $NIX_CFLAGS_COMPILE" ''; - cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [ - "-DDISABLE_LTO=ON" - ]; - # causes redefinition of _FORTIFY_SOURCE hardeningDisable = [ "fortify3" ]; @@ -73,6 +69,5 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ matthewcroughan ]; license = licenses.asl20; platforms = platforms.all; - broken = stdenv.hostPlatform.isDarwin; }; } diff --git a/pkgs/by-name/ze/zegrapher/package.nix b/pkgs/by-name/ze/zegrapher/package.nix index fa39de2eb551..73043d207399 100644 --- a/pkgs/by-name/ze/zegrapher/package.nix +++ b/pkgs/by-name/ze/zegrapher/package.nix @@ -1,6 +1,6 @@ { lib, - boost, + boost186, fetchFromGitHub, qt5, stdenv, @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost + boost186 ]; strictDeps = true; diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix index 26c67583e4fe..a14a2f967a64 100644 --- a/pkgs/by-name/zw/zwave-js-ui/package.nix +++ b/pkgs/by-name/zw/zwave-js-ui/package.nix @@ -7,15 +7,15 @@ buildNpmPackage rec { pname = "zwave-js-ui"; - version = "10.3.0"; + version = "10.3.3"; src = fetchFromGitHub { owner = "zwave-js"; repo = "zwave-js-ui"; tag = "v${version}"; - hash = "sha256-RfjjGpQhjpRV/+Uqh/uki9GRQQ3IrkyPkYY9hWUGWoA="; + hash = "sha256-SZIGwv/9aCA5/cZk8n32tkI/vu0oLw/t3dOJgf+km7c="; }; - npmDepsHash = "sha256-vjHqL3t5FiBWlh2lEeRr31Ynyu4peHyMC82zHsBbQ8E="; + npmDepsHash = "sha256-i3ug7syt4ElLiHV/kdwoaNvPYDsTdjlIg4XQbkB+Q4A="; passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui; diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index 99f59b27bdb9..256c11c45aa1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-about"; - version = "8.2.0"; + version = "8.2.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-NMi+QyIunUIzg9IlzeUCz2eQrQlF28lufFc51XOQljU="; + sha256 = "sha256-H4BDLP3yzQi+ougpvBvnv1R1TImzUjSOVDGbOqw9hvg="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix index 4fcf0b38af98..31a3180c320e 100644 --- a/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix +++ b/pkgs/desktops/pantheon/services/xdg-desktop-portal-pantheon/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-pantheon"; - version = "8.0.0"; + version = "8.0.1"; src = fetchFromGitHub { owner = "elementary"; repo = "portals"; rev = version; - sha256 = "sha256-pf7xQwsBRjjyOMUPe7fJp1vOhhBmuXJ6Uf4YosxbHtw="; + sha256 = "sha256-oBOyYE4NLlNmCRO9Uk22/OZb9+fXcyOICE8V3n4grEw="; }; nativeBuildInputs = [ diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 87b530017152..e2921431a7d0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1891,6 +1891,10 @@ self: super: feed = dontCheck super.feed; spacecookie = overrideCabal (old: { + # Security relevant patch update + version = "1.0.0.3"; + sha256 = "1kzzbq22dk277jcx04w154y4vwa92zmnf40jcbgiihkz5rvisix0"; + buildTools = (old.buildTools or [ ]) ++ [ pkgs.buildPackages.installShellFiles ]; # let testsuite discover the resulting binary preCheck = diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix index 560ce39a869d..005afaa1ab85 100644 --- a/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/pkgs/development/haskell-modules/configuration-darwin.nix @@ -20,6 +20,10 @@ self: super: __darwinAllowLocalNetworking = true; }); + spacecookie = super.spacecookie.overrideAttrs (_: { + __darwinAllowLocalNetworking = true; + }); + streaming-commons = super.streaming-commons.overrideAttrs (_: { __darwinAllowLocalNetworking = true; }); diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix index 6bed23f4eb94..61da508306c6 100644 --- a/pkgs/development/libraries/kompute/default.nix +++ b/pkgs/development/libraries/kompute/default.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, vulkan-headers, vulkan-loader, @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { "-DKOMPUTE_OPT_INSTALL=1" ]; + patches = [ + # FIXME: remove next update + (fetchpatch { + name = "vulkan-14-support.patch"; + url = "https://github.com/KomputeProject/kompute/commit/299b11fb4b8a7607c5d2c27e2735f26b06ae8e29.patch"; + sha256 = "sha256-JuoTQ+VjIdyF+I1IcT1ofbBjRS0Ibm2w6F2jrRJlx40="; + }) + ]; + nativeBuildInputs = [ cmake ninja diff --git a/pkgs/development/libraries/opencolorio/1.x.nix b/pkgs/development/libraries/opencolorio/1.x.nix index 4ac41482037f..c91fee14ed23 100644 --- a/pkgs/development/libraries/opencolorio/1.x.nix +++ b/pkgs/development/libraries/opencolorio/1.x.nix @@ -3,22 +3,22 @@ lib, fetchFromGitHub, cmake, - boost, + gitMinimal, pkg-config, lcms2, tinyxml, - git, + boost, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAtts: { pname = "opencolorio"; version = "1.1.1"; src = fetchFromGitHub { owner = "imageworks"; repo = "OpenColorIO"; - rev = "v${version}"; - sha256 = "12srvxca51czpfjl0gabpidj9n84mw78ivxy5w75qhq2mmc798sb"; + tag = "v${finalAtts.version}"; + hash = "sha256-S6N0WK0CQ1wOL77viA6vBNkkW7xLPUClu5+FoljfWYs="; }; outputs = [ @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { # TODO: Investigate whether git can be dropped: It's only used to apply patches nativeBuildInputs = [ cmake + gitMinimal pkg-config - git ]; buildInputs = [ @@ -57,6 +57,13 @@ stdenv.mkDerivation rec { stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 ) "-DCMAKE_OSX_ARCHITECTURES=arm64"; + env = lib.optionalAttrs stdenv.cc.isClang { + # yaml-cpp uses std::auto_ptr and std::binary_function which has + # been disabled in clang with libcxx. These flags re-enables these + # features + NIX_CXXSTDLIB_COMPILE = "-D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR=1 -D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION=1"; + }; + postInstall = '' moveToOutput bin "$bin" moveToOutput cmake "$dev" @@ -66,11 +73,11 @@ stdenv.mkDerivation rec { --replace "$out/bin" "$bin/bin" ''; - meta = with lib; { + meta = { homepage = "https://opencolorio.org"; description = "Color management framework for visual effects and animation"; - license = licenses.bsd3; - maintainers = [ ]; - platforms = platforms.unix; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ yzx9 ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix index 64c8b1ae044d..76c6221cb664 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix @@ -113,6 +113,8 @@ qtModule { # Fix build with Pipewire 1.4 ./pipewire-1.4.patch + # Reproducibility QTBUG-136068 + ./gn-object-sorted.patch ]; postPatch = diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/gn-object-sorted.patch b/pkgs/development/libraries/qt-6/modules/qtwebengine/gn-object-sorted.patch new file mode 100644 index 000000000000..4e6b0672d83a --- /dev/null +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/gn-object-sorted.patch @@ -0,0 +1,32 @@ +diff --git a/gn/src/gn/rsp_target_writer.cc b/gn/src/gn/rsp_target_writer.cc +index 6c1c687e99d..097b84b317e 100644 +--- a/src/3rdparty/gn/src/gn/rsp_target_writer.cc ++++ b/src/3rdparty/gn/src/gn/rsp_target_writer.cc +@@ -117,8 +117,7 @@ void RspTargetWriter::Run() { + PathOutput path_output(settings->build_settings()->build_dir(), + settings->build_settings()->root_path_utf8(), + ESCAPE_NONE); +- std::vector object_files; +- object_files.reserve(target_->sources().size()); ++ std::set object_files; + + for (const auto& source : target_->sources()) { + const char* tool_type = nullptr; +@@ -128,7 +127,7 @@ void RspTargetWriter::Run() { + other_files.push_back(source); + continue; // No output for this source. + } +- object_files.push_back( ++ object_files.insert( + tool_outputs[0].AsSourceFile(settings->build_settings())); + } + if (target_->config_values().has_precompiled_headers()) { +@@ -137,7 +136,7 @@ void RspTargetWriter::Run() { + if (tool_cxx && tool_cxx->precompiled_header_type() == CTool::PCH_MSVC) { + GetPCHOutputFiles(target_, CTool::kCToolCxx, &tool_outputs); + if (!tool_outputs.empty()) +- object_files.push_back( ++ object_files.insert( + tool_outputs[0].AsSourceFile(settings->build_settings())); + } + } diff --git a/pkgs/development/python-modules/aiohttp-swagger/default.nix b/pkgs/development/python-modules/aiohttp-swagger/default.nix index 0b7dc5c6ea2e..7fd13e12ebbe 100644 --- a/pkgs/development/python-modules/aiohttp-swagger/default.nix +++ b/pkgs/development/python-modules/aiohttp-swagger/default.nix @@ -2,11 +2,10 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, aiohttp, jinja2, markupsafe, - pytest-aiohttp, - pytestCheckHook, pythonOlder, pyyaml, }: @@ -14,45 +13,38 @@ buildPythonPackage rec { pname = "aiohttp-swagger"; version = "1.0.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cr0hn"; - repo = pname; - rev = version; + repo = "aiohttp-swagger"; + tag = version; hash = "sha256-M43sNpbXWXFRTd549cZhvhO35nBB6OH+ki36BzSk87Q="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ aiohttp jinja2 markupsafe pyyaml ]; - nativeCheckInputs = [ - pytestCheckHook - pytest-aiohttp + pythonRelaxDeps = [ + "markupsafe" + "jinja2" ]; - postPatch = '' - substituteInPlace requirements.txt \ - --replace "markupsafe~=1.1.1" "markupsafe>=1.1.1" \ - --replace "jinja2~=2.11.2" "jinja2>=2.11.2" - ''; - - preCheck = '' - # The custom client is obsolete - rm tests/conftest.py - ''; - pythonImportsCheck = [ "aiohttp_swagger" ]; - meta = with lib; { + meta = { description = "Swagger API Documentation builder for aiohttp"; homepage = "https://github.com/cr0hn/aiohttp-swagger"; - license = licenses.mit; + license = lib.licenses.mit; }; } diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix index 5b3ab519150b..115d0500f632 100644 --- a/pkgs/development/python-modules/docling-core/default.nix +++ b/pkgs/development/python-modules/docling-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "docling-core"; - version = "2.28.0"; + version = "2.29.0"; pyproject = true; src = fetchFromGitHub { owner = "docling-project"; repo = "docling-core"; tag = "v${version}"; - hash = "sha256-vvaqO9rsXeQUt5+u9aEC1JNvXSgFMgfqNjjZLXjqkmA="; + hash = "sha256-KUDqaZv6gE0t5FXjQiuKUsmtV0qMKyF637z7Zg+LYoE="; }; build-system = [ diff --git a/pkgs/development/python-modules/essentials-openapi/default.nix b/pkgs/development/python-modules/essentials-openapi/default.nix index cc31f97a17bb..450aedcca5b2 100644 --- a/pkgs/development/python-modules/essentials-openapi/default.nix +++ b/pkgs/development/python-modules/essentials-openapi/default.nix @@ -14,6 +14,7 @@ pyyaml, rich, setuptools, + stdenv, }: buildPythonPackage rec { pname = "essentials-openapi"; @@ -59,6 +60,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "openapidocs" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # These tests start a server using a hardcoded port, and since + # multiple Python versions are always built simultaneously, this + # failure is quite likely to occur. + "tests/test_cli.py" + ]; + meta = { homepage = "https://github.com/Neoteroi/essentials-openapi"; description = "Functions to handle OpenAPI Documentation"; diff --git a/pkgs/development/python-modules/essentials/default.nix b/pkgs/development/python-modules/essentials/default.nix index e94a3ccf98b8..f0174bb0a081 100644 --- a/pkgs/development/python-modules/essentials/default.nix +++ b/pkgs/development/python-modules/essentials/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, setuptools, pytestCheckHook, + stdenv, lib, }: buildPythonPackage rec { @@ -21,6 +22,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ + # time.sleep(0.01) can be up to 0.05s on darwin + "test_stopwatch" + "test_stopwatch_with_context_manager" + ]; + pythonImportsCheck = [ "essentials" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 3a3bca529ec2..4555e9772d1f 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.6.17"; + version = "0.6.18"; pyproject = true; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_ai_generativelanguage"; inherit version; - hash = "sha256-hDlQNQOrpshbOHFQT0kLvGa+hUAx2LtNWsldPKIXPzg="; + hash = "sha256-J0up/PaUZv9k6XHVZYhENDiOUjMAr9Ro/I4wM82OYG4="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/h5io/default.nix b/pkgs/development/python-modules/h5io/default.nix index 5d27c615d4f4..8b17e173d80e 100644 --- a/pkgs/development/python-modules/h5io/default.nix +++ b/pkgs/development/python-modules/h5io/default.nix @@ -2,25 +2,30 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, - setuptools, - numpy, + + # build-system + setuptools-scm, + + # dependencies h5py, + numpy, + + # tests pytestCheckHook, + scipy, + tables, }: buildPythonPackage rec { pname = "h5io"; - version = "0.2.1"; + version = "0.2.5"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "h5io"; repo = "h5io"; tag = "h5io-${version}"; - hash = "sha256-3mrHIkfaXq06mMzUwudRO81DWTk0TO/e15IQA5fxxNc="; + hash = "sha256-ZkG9e7KtDvoRq9XCExYseE+Z7tMQTWcSiwsSrN5prdI="; }; postPatch = '' @@ -30,22 +35,31 @@ buildPythonPackage rec { --replace "--cov=h5io" "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - numpy + dependencies = [ h5py + numpy ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + pytestCheckHook + scipy + tables + ]; + + disabledTests = [ + # See https://github.com/h5io/h5io/issues/86 + "test_state_with_pathlib" + ]; pythonImportsCheck = [ "h5io" ]; - meta = with lib; { + meta = { description = "Read and write simple Python objects using HDF5"; homepage = "https://github.com/h5io/h5io"; changelog = "https://github.com/h5io/h5io/releases/tag/h5io-${version}"; - license = licenses.bsd3; - maintainers = with maintainers; [ mbalatsko ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ mbalatsko ]; }; } diff --git a/pkgs/development/python-modules/hdbscan/default.nix b/pkgs/development/python-modules/hdbscan/default.nix index 509921eb6d7b..0312436eaf95 100644 --- a/pkgs/development/python-modules/hdbscan/default.nix +++ b/pkgs/development/python-modules/hdbscan/default.nix @@ -1,14 +1,18 @@ { lib, buildPythonPackage, + fetchFromGitHub, + fetchpatch, + cython, numpy, - pytestCheckHook, scipy, scikit-learn, - fetchPypi, joblib, six, + + # test + pytestCheckHook, }: buildPythonPackage rec { @@ -16,27 +20,40 @@ buildPythonPackage rec { version = "0.8.40"; format = "setuptools"; - src = fetchPypi { - inherit pname version; - hash = "sha256-yeOD/xe+7gWRB1/2XVJL2ltaNd+wHSGCRae6MMjUihc="; + src = fetchFromGitHub { + owner = "scikit-learn-contrib"; + repo = "hdbscan"; + tag = "release-${version}"; + hash = "sha256-xsBlmSQU47e+M+nRqUXdWKS7Rtj2QZ1UWLAvjSQOJ0Q="; }; + patches = [ + (fetchpatch { + # Replace obsolete use of assert_raises with pytest.raises + name = "replace-assert_raises"; + url = "https://github.com/scikit-learn-contrib/hdbscan/pull/667/commits/04d6a4dcdcd2bb2597419b8aa981d7620765809f.patch"; + hash = "sha256-z/u5b2rNPKOCe+3/GVE8rMB5ajeU5PrvLVesjEgj9TA="; + }) + ]; + pythonRemoveDeps = [ "cython" ]; + nativeBuildInputs = [ cython - ]; - propagatedBuildInputs = [ - numpy - scipy - scikit-learn joblib + numpy + scikit-learn + scipy six ]; + preCheck = '' cd hdbscan/tests rm __init__.py ''; + nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ # known flaky tests: https://github.com/scikit-learn-contrib/hdbscan/issues/420 "test_mem_vec_diff_clusters" @@ -47,13 +64,22 @@ buildPythonPackage rec { # more flaky tests https://github.com/scikit-learn-contrib/hdbscan/issues/570 "test_hdbscan_boruvka_balltree" "test_hdbscan_best_balltree_metric" + # "got an unexpected keyword argument" + "test_hdbscan_badargs" + ]; + + disabledTestPaths = [ + # joblib.externals.loky.process_executor.BrokenProcessPool: + "test_branches.py" ]; pythonImportsCheck = [ "hdbscan" ]; - meta = with lib; { + meta = { description = "Hierarchical Density-Based Spatial Clustering of Applications with Noise, a clustering algorithm with a scikit-learn compatible API"; homepage = "https://github.com/scikit-learn-contrib/hdbscan"; - license = licenses.bsd3; + changelog = "https://github.com/scikit-learn-contrib/hdbscan/releases/tag/release-${version}"; + license = lib.licenses.bsd3; + maintainers = [ ]; }; } diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index 30670a8716c2..848bb9cac979 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,23 +1,58 @@ { lib, - fetchPypi, buildPythonPackage, - isPy27, + fetchFromGitHub, + fetchpatch, + + # build-system + setuptools, + + # dependencies sphinx, }: buildPythonPackage rec { pname = "hieroglyph"; version = "2.1.0"; - format = "setuptools"; - disabled = isPy27; # python2 compatible sphinx is too low - src = fetchPypi { - inherit pname version; - sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf"; + src = fetchFromGitHub { + owner = "nyergler"; + repo = "hieroglyph"; + tag = "hieroglyph-${version}"; + hash = "sha256-nr5cHF0Lg2mjQvnOoM5HCmMUiGh1QOeTD0nc8BvCBOE="; }; - propagatedBuildInputs = [ sphinx ]; + pyproject = true; + + build-system = [ setuptools ]; + + patches = [ + # https://github.com/nyergler/hieroglyph/pull/177hieroglyph-quickstart + (fetchpatch { + name = "hieroglyph-upgrade-versioneer"; + url = "https://github.com/nyergler/hieroglyph/commit/9cebee269ac10964b2436c0204156b7bd620a3d4.patch"; + hash = "sha256-ZvU7uASU727/NUAW8I7k9idzMpEdnuwRshdHm2/GQ3w="; + }) + # https://github.com/nyergler/hieroglyph/pull/174 + (fetchpatch { + name = "hieroglyph-slide-builder-type-error"; + url = "https://github.com/nyergler/hieroglyph/pull/174/commits/d75c550f797e3635d33db11f50968755288962a7.patch"; + hash = "sha256-qNQVgWL9jy0cwtxKUbWi3Qc77RU2H3raN0BzBjDk9C8="; + }) + ]; + + # load_additional_themes has been deprecated, need to use its deprecated name + postPatch = '' + substituteInPlace src/hieroglyph/builder.py \ + --replace-fail "theme_factory.load_additional_themes" "theme_factory._load_additional_themes" + ''; + + dependencies = [ + setuptools + sphinx + ]; + + pythonImportsCheck = [ "hieroglyph" ]; # all tests fail; don't know why: # test_absolute_paths_made_relative (hieroglyph.tests.test_path_fixing.PostProcessImageTests) ... ERROR diff --git a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix index f8f4e1023c22..d8e823355b32 100644 --- a/pkgs/development/python-modules/jupyter-server-ydoc/default.nix +++ b/pkgs/development/python-modules/jupyter-server-ydoc/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "jupyter-server-ydoc"; - version = "2.0.1"; + version = "2.0.2"; pyproject = true; src = fetchPypi { pname = "jupyter_server_ydoc"; inherit version; - hash = "sha256-9P2n9D0HUkU+lmIffniD7tAJEUbe7Q7jjC/l+Cxps/U="; + hash = "sha256-Iu5y57yeLZ/emIIJLRdqyMpxAfsHj2/vTLcqgSlRCSg="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/kaggle/default.nix b/pkgs/development/python-modules/kaggle/default.nix index d03fe081a593..7d61254006cb 100644 --- a/pkgs/development/python-modules/kaggle/default.nix +++ b/pkgs/development/python-modules/kaggle/default.nix @@ -16,6 +16,7 @@ tqdm, urllib3, webencodings, + protobuf, }: buildPythonPackage rec { @@ -44,6 +45,7 @@ buildPythonPackage rec { tqdm urllib3 webencodings + protobuf ]; # Tests try to access the network. diff --git a/pkgs/development/python-modules/meeko/default.nix b/pkgs/development/python-modules/meeko/default.nix index 68aa0972a575..f9f7c60f045a 100644 --- a/pkgs/development/python-modules/meeko/default.nix +++ b/pkgs/development/python-modules/meeko/default.nix @@ -2,7 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, + gemmi, numpy, pytestCheckHook, pythonOlder, @@ -24,22 +24,9 @@ buildPythonPackage rec { hash = "sha256-ViIBiczwxTwraYn8UnFAZFCFT28v3WEYm04W2YpU/4g="; }; - patches = [ - # https://github.com/forlilab/Meeko/issues/60 - (fetchpatch { - name = "fix-unknown-sidechains.patch"; - url = "https://github.com/forlilab/Meeko/commit/28c9fbfe3b778aa1bd5e8d7e4f3e6edf44633a0c.patch"; - hash = "sha256-EJbLnbKTTOsTxKtLiU7Af07yjfY63ungGUHbGvrm0AU="; - }) - (fetchpatch { - name = "add-test-data.patch"; - url = "https://github.com/forlilab/Meeko/commit/57b52e3afffb82685cdd1ef1bf6820d55924b97a.patch"; - hash = "sha256-nLnyIjT68iaY3lAEbH9EJ5jZflhxABBwDqw8kaRKf3k="; - }) - ]; - propagatedBuildInputs = [ # setup.py only requires numpy but others are needed at runtime + gemmi numpy rdkit scipy diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 0f62f62fec2f..a4b47e4b46ba 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.13.4"; + version = "0.13.5"; pyproject = true; src = fetchFromGitHub { owner = "has2k1"; repo = "mizani"; tag = "v${version}"; - hash = "sha256-gZ4rJw+m0XgpfV6nylTqR6Taer6bok5E93WxOyAhXCk="; + hash = "sha256-W88B8WCwIqjMhjoDJaksHBhvg/Sr0RRDwo9stniyzkM="; }; build-system = [ setuptools-scm ]; diff --git a/pkgs/development/python-modules/nbsphinx/default.nix b/pkgs/development/python-modules/nbsphinx/default.nix index f3187d955701..4ad780b353b8 100644 --- a/pkgs/development/python-modules/nbsphinx/default.nix +++ b/pkgs/development/python-modules/nbsphinx/default.nix @@ -1,6 +1,7 @@ { lib, buildPythonPackage, + fetchpatch, fetchPypi, setuptools, docutils, @@ -23,6 +24,12 @@ buildPythonPackage rec { inherit pname version; hash = "sha256-q9KYpobVX6iU72l8UdRPJOU6oxLa2uOOgpIPJQpUVv4="; }; + patches = [ + (fetchpatch { + url = "https://github.com/spatialaudio/nbsphinx/commit/a921973a5d8ecc39c6e02184572b79ab72c9978c.patch"; + hash = "sha256-uxfSaOESWn8uVcUm+1ADzQgMQDEqaTs0TbfNYsS+E6I="; + }) + ]; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix index ad9f8ef42bd9..cc7fd7dc4542 100644 --- a/pkgs/development/python-modules/neoteroi-mkdocs/default.nix +++ b/pkgs/development/python-modules/neoteroi-mkdocs/default.nix @@ -12,6 +12,7 @@ pytestCheckHook, rich, setuptools, + stdenv, }: buildPythonPackage rec { pname = "neoteroi-mkdocs"; @@ -48,6 +49,13 @@ buildPythonPackage rec { pythonImportsCheck = [ "neoteroi.mkdocs" ]; + disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [ + # These tests start a server using a hardcoded port, and since + # multiple Python versions are always built simultaneously, this + # failure is quite likely to occur. + "tests/test_http.py" + ]; + meta = with lib; { homepage = "https://github.com/Neoteroi/mkdocs-plugins"; description = "Plugins for MkDocs"; diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index 317c13e85416..c4717e7e1f36 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -23,14 +23,14 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.5.7"; + version = "2.5.8"; pyproject = true; src = fetchFromGitHub { owner = "milvus-io"; repo = "pymilvus"; tag = "v${version}"; - hash = "sha256-Sv1V8JjDQtgyKdd8yFNbXIXUK9hmlyB4xsmk49W0wGk="; + hash = "sha256-AsbUt5dyVsrbWYzjsqe7bMs4E/npkKTetfHrDK4kt6I="; }; build-system = [ diff --git a/pkgs/development/python-modules/pystemd/default.nix b/pkgs/development/python-modules/pystemd/default.nix index 86be5f000ed5..f91803243e67 100644 --- a/pkgs/development/python-modules/pystemd/default.nix +++ b/pkgs/development/python-modules/pystemd/default.nix @@ -2,26 +2,41 @@ buildPythonPackage, lib, fetchPypi, + setuptools, systemd, lxml, psutil, pytest, mock, pkg-config, + cython, }: buildPythonPackage rec { pname = "pystemd"; version = "0.13.2"; - format = "setuptools"; + pyproject = true; + src = fetchPypi { inherit pname version; hash = "sha256-Tc+ksTpVaFxJ09F8EGMeyhjDN3D2Yxb47yM3uJUcwUQ="; }; + postPatch = '' + # remove cythonized sources, build them anew to support more python version + rm pystemd/*.c + ''; + buildInputs = [ systemd ]; - nativeBuildInputs = [ pkg-config ]; + build-system = [ + setuptools + cython + ]; + + nativeBuildInputs = [ + pkg-config + ]; propagatedBuildInputs = [ lxml @@ -33,15 +48,22 @@ buildPythonPackage rec { pytest ]; - checkPhase = "pytest tests"; + checkPhase = '' + runHook preCheck + # pytestCheckHook doesn't work + pytest tests + runHook postCheck + ''; - meta = with lib; { + pythonImportsCheck = [ "pystemd" ]; + + meta = { description = '' Thin Cython-based wrapper on top of libsystemd, focused on exposing the dbus API via sd-bus in an automated and easy to consume way ''; homepage = "https://github.com/facebookincubator/pystemd/"; - license = licenses.lgpl21Plus; - maintainers = with maintainers; [ flokli ]; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ flokli ]; }; } diff --git a/pkgs/development/python-modules/rdkit/default.nix b/pkgs/development/python-modules/rdkit/default.nix index fd66dd16cb90..77cd25503084 100644 --- a/pkgs/development/python-modules/rdkit/default.nix +++ b/pkgs/development/python-modules/rdkit/default.nix @@ -117,11 +117,11 @@ buildPythonPackage rec { (lib.cmakeBool "RDK_BUILD_INCHI_SUPPORT" true) (lib.cmakeBool "RDK_BUILD_MAEPARSER_SUPPORT" true) (lib.cmakeBool "RDK_BUILD_THREADSAFE_SSS" true) + (lib.cmakeBool "RDK_BUILD_XYZ2MOL_SUPPORT" true) (lib.cmakeBool "RDK_BUILD_YAEHMOP_SUPPORT" true) (lib.cmakeBool "RDK_INSTALL_INTREE" false) (lib.cmakeBool "RDK_INSTALL_STATIC_LIBS" false) (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) - (lib.cmakeBool "RDK_TEST_MULTITHREADED" true) (lib.cmakeBool "RDK_USE_FLEXBISON" false) (lib.cmakeBool "RDK_USE_URF" false) (lib.cmakeFeature "AVALONTOOLS_DIR" "avalon") @@ -141,6 +141,7 @@ buildPythonPackage rec { "rdkit" "rdkit.Chem" "rdkit.Chem.AllChem" + "rdkit.Chem.rdDetermineBonds" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix index 02ceff2c6dc9..0a15f5b918aa 100644 --- a/pkgs/development/python-modules/sagemaker-core/default.nix +++ b/pkgs/development/python-modules/sagemaker-core/default.nix @@ -28,14 +28,14 @@ buildPythonPackage rec { pname = "sagemaker-core"; - version = "1.0.29"; + version = "1.0.31"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "sagemaker-core"; tag = "v${version}"; - hash = "sha256-m/gxOnQmYhNjAMM5DG3DzllWcWmfjD3B0NRY+wyGVP8="; + hash = "sha256-cZbGma/H8XrQwuyXCPxwjPe3b9w21DXoWAWgqaoBYJE="; }; build-system = [ diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix new file mode 100644 index 000000000000..63c45ee9f3f7 --- /dev/null +++ b/pkgs/development/python-modules/temporalio/default.nix @@ -0,0 +1,84 @@ +{ + lib, + buildPackages, + buildPythonPackage, + cargo, + fetchFromGitHub, + maturin, + pythonOlder, + poetry-core, + protobuf, + python-dateutil, + rustc, + rustPlatform, + setuptools, + setuptools-rust, + types-protobuf, + typing-extensions, +}: + +buildPythonPackage rec { + pname = "temporalio"; + version = "1.11.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "temporalio"; + repo = "sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-942EmFOAYUWq58MW2rIVhDK9dHkzi62fUdOudYP94hU="; + fetchSubmodules = true; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version src; + sourceRoot = "${src.name}/${cargoRoot}"; + hash = "sha256-9hP+zN6jcRmRhPmcZ4Zgp61IeS7gDPfsOvweAxKHnHM="; + }; + + cargoRoot = "temporalio/bridge"; + + build-system = [ + maturin + poetry-core + ]; + + preBuild = '' + export PROTOC=${buildPackages.protobuf}/bin/protoc + ''; + + dependencies = [ + protobuf + types-protobuf + typing-extensions + ] ++ lib.optional (pythonOlder "3.11") python-dateutil; + + nativeBuildInputs = [ + cargo + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + rustc + setuptools + setuptools-rust + ]; + + pythonImportsCheck = [ + "temporalio" + "temporalio.bridge.temporal_sdk_bridge" + "temporalio.client" + "temporalio.worker" + ]; + + meta = { + description = "Temporal Python SDK"; + homepage = "https://temporal.io/"; + changelog = "https://github.com/temporalio/sdk-python/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + jpds + levigross + ]; + }; +} diff --git a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix index 450f3df1a06d..32bb64e8b834 100644 --- a/pkgs/development/python-modules/uv-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/uv-dynamic-versioning/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "uv-dynamic-versioning"; - version = "0.8.0"; + version = "0.8.2"; pyproject = true; src = fetchFromGitHub { @@ -31,7 +31,7 @@ buildPythonPackage rec { tag = "v${version}"; # Tests perform mock operations on the local repo leaveDotGit = true; - hash = "sha256-DO10OGij7koV5VYqywRR28pg0sEOAuGpqz1Ksf39MQo="; + hash = "sha256-iIWghJXhs0IblO7Kgfe6lEc0F/KYF1c8/TN5tkIvXa0="; }; build-system = [ diff --git a/pkgs/development/python-modules/vg/default.nix b/pkgs/development/python-modules/vg/default.nix index 820b8759bfbd..dbf4b1436b94 100644 --- a/pkgs/development/python-modules/vg/default.nix +++ b/pkgs/development/python-modules/vg/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "vg"; version = "2.0.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -27,19 +27,21 @@ buildPythonPackage rec { --replace 'requires = ["setuptools", "poetry-core>=1.0.0"]' 'requires = ["poetry-core>=1.0.0"]' ''; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; - propagatedBuildInputs = [ numpy ]; + dependencies = [ numpy ]; nativeCheckInputs = [ pytestCheckHook ]; + disabledTests = [ "test_basic" ]; + pythonImportsCheck = [ "vg" ]; - meta = with lib; { + meta = { description = "Linear algebra for humans: a very good vector-geometry and linear-algebra toolbelt"; homepage = "https://github.com/lace/vg"; changelog = "https://github.com/lace/vg/blob/${version}/CHANGELOG.md"; - license = with licenses; [ bsd2 ]; - maintainers = with maintainers; [ clerie ]; + license = [ lib.licenses.bsd2 ]; + maintainers = with lib.maintainers; [ clerie ]; }; } diff --git a/pkgs/development/python-modules/yalexs-ble/default.nix b/pkgs/development/python-modules/yalexs-ble/default.nix index c573e277117a..182fb14eeba9 100644 --- a/pkgs/development/python-modules/yalexs-ble/default.nix +++ b/pkgs/development/python-modules/yalexs-ble/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs-ble"; - version = "2.6.0"; + version = "3.0.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = "yalexs-ble"; tag = "v${version}"; - hash = "sha256-NSN0i99Pd3ivRd9aFIDu/CnQHCMbEIqpceDaeB5k3vU="; + hash = "sha256-sHAdeL3mUUsKqRkv9suA3mfbwJvMADpMqt1Qu5lITnQ="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 65309c7c42de..893caa3cfee3 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -229,8 +229,8 @@ rec { # https://docs.gradle.org/current/userguide/compatibility.html gradle_8 = gen { - version = "8.13"; - hash = "sha256-IPGxF2I3JUpvwgTYQ0GW+hGkz7OHVnUZxhVW6HEK7Xg="; + version = "8.14"; + hash = "sha256-Ya0xDTx9Pl2hMbdrvyK1pMB4bp2JLa6MFljUtITePKo="; defaultJava = jdk21; }; @@ -286,7 +286,8 @@ rec { tests = { toolchains = let - javaVersion = lib.versions.major (lib.getVersion jdk23); + javaVersion = lib.getVersion jdk23; + javaMajorVersion = lib.versions.major javaVersion; in runCommand "detects-toolchains-from-nix-env" { @@ -302,10 +303,14 @@ rec { } '' cp -a $src/* . - substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaVersion}' + substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}' env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \ gradle run --no-daemon --quiet --console plain > $out - test "$(<$out)" = "${javaVersion}" + actual="$(<$out)" + if [[ "${javaVersion}" != "$actual"* ]]; then + echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2 + exit 1 + fi ''; } // gradle.tests; } diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix index 6c54a158f0d9..4ff7bb3d2ff6 100644 --- a/pkgs/development/web/nodejs/v24.nix +++ b/pkgs/development/web/nodejs/v24.nix @@ -17,8 +17,8 @@ let in buildNodejs { inherit enableNpm; - version = "24.0.0-rc.2"; - sha256 = "729fca42bb7266031dd020f3935423ea8d4b4e2d119b34b608f1d079e5c1621a"; + version = "24.0.0-rc.3"; + sha256 = "9bbca08fba05f075a20f734ea80b195a4a39218476b60b32db79e1d393fda20b"; patches = ( if (stdenv.hostPlatform.emulatorAvailable buildPackages) then @@ -51,11 +51,6 @@ buildNodejs { ./node-npm-build-npm-package-logic.patch ./use-correct-env-in-tests.patch ./bin-sh-node-run-v22.patch - # fix test failure on macos 15.4 - (fetchpatch2 { - url = "https://github.com/nodejs/node/commit/33f6e1ea296cd20366ab94e666b03899a081af94.patch?full_index=1"; - hash = "sha256-aVBMcQlhQeviUQpMIfC988jjDB2BgYzlMYsq+w16mzU="; - }) ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin) [ # test-icu-env is failing without the reverts diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index f8ef4e598d0f..1f3e43e02d1f 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -7,7 +7,7 @@ qtbase, SDL, SDL_mixer, - boost, + boost181, curl, gsasl, libgcrypt, @@ -19,6 +19,10 @@ target ? "client", }: +let + boost = boost181; +in + mkDerivation rec { pname = "pokerth-${target}"; version = "1.1.2"; diff --git a/pkgs/tools/games/steamback/default.nix b/pkgs/tools/games/steamback/default.nix index 662b6a06c6d8..05f77f0e65a6 100644 --- a/pkgs/tools/games/steamback/default.nix +++ b/pkgs/tools/games/steamback/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { hash = "sha256-hvMPSxIfwwQqo80JCpYhcbVY4kXs5jWtjjafVSMrw6o="; }; - nativeBuildInputs = [ + build-system = [ setuptools-scm wheel ]; @@ -33,7 +33,7 @@ buildPythonApplication rec { pillow ]; - propagatedBuildInputs = [ + dependencies = [ psutil async-tkinter-loop timeago @@ -45,21 +45,29 @@ buildPythonApplication rec { "async-tkinter-loop" "platformdirs" "Pillow" + "psutil" ]; checkPhase = '' runHook preCheck - $out/bin/${pname} --help + $out/bin/steamback --help runHook postCheck ''; - meta = with lib; { + pythonImportsCheck = [ + "steamback" + "steamback.gui" + "steamback.test" + "steamback.util" + ]; + + meta = { description = "Decky plugin to add versioned save-game snapshots to Steam-cloud enabled games"; mainProgram = "steamback"; homepage = "https://github.com/geeksville/steamback"; - license = licenses.gpl3; - maintainers = with maintainers; [ AngryAnt ]; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ AngryAnt ]; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 4fdead517c5f..77cad786f9d3 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ]; # We need _GNU_SOURCE so that mallocmock_reset() is defined: https://savannah.gnu.org/bugs/?66416 - NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isGNU) "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; + NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE=1 -Wno-int-conversion -Wno-incompatible-pointer-types"; patches = [ # GNU Screen 5.0 uses strncpy incorrectly in SendCmdMessage @@ -42,7 +42,8 @@ stdenv.mkDerivation rec { ]; # The test suite seems to have some glibc malloc hooks that don't exist/link on macOS - doCheck = !stdenv.hostPlatform.isDarwin; + # With pkgsLLVM: tests/test-winmsgcond.c:53: assertion 'wmc_end(&wmc, pos + 1, &chg) == pos' failed + doCheck = !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.useLLVM; meta = with lib; { homepage = "https://www.gnu.org/software/screen/"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 51bf85042ff6..bbc45db63605 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -709,6 +709,7 @@ mapAliases { gg = go-graft; # Added 2025-03-07 ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18 git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25 + gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02 gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28 gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14 gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14 @@ -951,6 +952,7 @@ mapAliases { libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24 + libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02 libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28 libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05 libgda = lib.warnOnInstantiate "‘libgda’ has been renamed to ‘libgda5’" libgda5; # Added 2025-01-21 @@ -1349,6 +1351,7 @@ mapAliases { openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24 + oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26 openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07 openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01 openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01 @@ -1396,6 +1399,7 @@ mapAliases { passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24 p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20 packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17 + paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30 inherit (perlPackages) pacup; panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25 paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7abd08dae853..ff42b9b8577c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2759,8 +2759,6 @@ with pkgs; persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { }; - twitch-tui = callPackage ../applications/networking/instant-messengers/twitch-tui { }; - inherit (import ../development/libraries/libsbsms pkgs) libsbsms libsbsms_2_0_2 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10a5fe61db5e..90ee78dc1df1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16999,6 +16999,8 @@ self: super: with self; { tempora = callPackage ../development/python-modules/tempora { }; + temporalio = callPackage ../development/python-modules/temporalio { }; + tenacity = callPackage ../development/python-modules/tenacity { }; tenant-schemas-celery = callPackage ../development/python-modules/tenant-schemas-celery { };